Merge branch 'szzh' into dev_zanle

Conflicts:
	public/javascripts/new_user.js
	public/stylesheets/header.css
	public/stylesheets/new_user.css

app/controllers/comments_controller.rb

@@ -49,6 +49,9 @@ class CommentsController < ApplicationController
       # end
       # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
       flash[:notice] = l(:label_comment_added)
+      user_activity = UserActivity.where("act_type='News' and act_id =#{@news.id}").first
+      user_activity.updated_at = @comment.created_on
+      user_activity.save
     end
 
     if params[:user_activity_id]

app/controllers/courses_controller.rb

@@ -631,6 +631,11 @@ class CoursesController < ApplicationController
   end
 
   def feedback
+   @course.journals_for_messages.each do |messages|
+     query = messages.course_messages.where("user_id = ?", User.current.id)
+     query.update_all(:viewed => true);
+   end
+
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
       # Find the page of the requested reply

app/controllers/homework_common_controller.rb

@@ -5,9 +5,9 @@ class HomeworkCommonController < ApplicationController
   layout "base_courses"
 
   include StudentWorkHelper
-  before_filter :find_course, :only => [:index,:new,:create,:next_step]
-  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]
+  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,:start_evaluation_set,:set_evaluation_attr]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -23,120 +23,16 @@ class HomeworkCommonController < ApplicationController
   #新建作业，在个人作业列表创建作业
   def new
     render_404
-    # @homework_type = "1"
-    #
-    # @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')
-    #
-    # if @homework_type == "1"
-    #   #匿评作业相关属性
-    #   @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
-    # elsif @homework_type == "2"
-    #   #编程作业相关属性
-    #   @homework_detail_programing = HomeworkDetailPrograming.new
-    #   @homework.homework_detail_programing = @homework_detail_programing
-    # end
-    # respond_to do |format|
-    #   format.html
-    # end
   end
 
   #新建作业，在个人作业列表创建作业
   def create
     redirect_to user_homeworks_user_path(User.current.id)
-    # 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)
-    #
-    #   if homework.homework_type == 2
-    #     homework_detail_programing = HomeworkDetailPrograming.new
-    #     homework_detail_programing.language = params[:language]
-    #     homework_detail_programing.standard_code = params[:standard_code]
-    #     homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
-    #     question = {title:homework.name,content:homework.description}
-    #     question[:input] = []
-    #     question[:output] = []
-    #     if params[:input] && params[:output] && params[:result]
-    #       params[:input].each do |k,v|
-    #         if params[:output].include? k
-    #           homework_test = HomeworkTest.new
-    #           homework_test.input = v
-    #           homework_test.output = params[:output][k]
-    #           homework_test.result = params[:result][k]
-    #           homework_test.error_msg = params[:error_msg]
-    #           homework.homework_tests << homework_test
-    #           question[:input] << homework_test.input
-    #           question[:output] << homework_test.output
-    #         end
-    #       end
-    #     end
-    #
-    #     # uri = URI('http://192.168.80.21:8080/api/questions.json')
-    #     # body = question.to_json
-    #     # res = Net::HTTP.new(uri.host, uri.port).start do |client|
-    #     #   request                 = Net::HTTP::Post.new(uri.path)
-    #     #   request.body            = body
-    #     #   request["Content-Type"] = "application/json"
-    #     #   client.request(request)
-    #     # end
-    #     # result = JSON.parse(res.body)
-    #     # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0
-    #
-    #     homework.homework_detail_programing = homework_detail_programing
-    #   else
-    #     #匿评作业相关属性
-    #     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
-    #   end
-    #
-    #   if homework.save
-    #     homework_detail_programing.save if homework_detail_programing
-    #     homework_detail_manual.save if homework_detail_manual
-    #     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
     @user = User.current
+    @is_in_course = params[:is_in_course]
     respond_to do |format|
       format.html{render :layout => 'new_base_user'}
     end
@@ -149,6 +45,10 @@ class HomeworkCommonController < ApplicationController
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
 
+      homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
+      homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? @homework.end_time + 7 : params[:evaluation_start]
+      homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
+
       @homework.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@homework)
 
@@ -156,7 +56,6 @@ class HomeworkCommonController < ApplicationController
       if @homework.homework_type == 2
           @homework.homework_detail_programing ||= HomeworkDetailPrograming.new
           @homework_detail_programing = @homework.homework_detail_programing
-          @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
           @homework_detail_programing.language = params[:language_type].to_i
 
           @homework.homework_tests.delete_all
@@ -174,15 +73,25 @@ class HomeworkCommonController < ApplicationController
       if @homework.save
         @homework_detail_manual.save if @homework_detail_manual
         @homework_detail_programing.save if @homework_detail_programing
+        if params[:is_in_course] == "1"
+          redirect_to homework_common_index_path(:course => @course.id)
+        else
           redirect_to user_homeworks_user_path(User.current.id)
         end
       end
     end
+  end
 
   def destroy
     if @homework.destroy
       respond_to do |format|
-        format.html {redirect_to user_homeworks_user_path(User.current.id)}
+        format.html {
+          if params[:is_in_course] == "1"
+            redirect_to homework_common_index_path(:course => @course.id)
+          else
+            redirect_to user_homeworks_user_path(User.current.id)
+          end
+        }
       end
     end
   end
@@ -207,6 +116,9 @@ class HomeworkCommonController < ApplicationController
         end
         @homework_detail_manual.update_column('comment_status', 2)
         @statue = 1
+        # 匿评开启消息邮件通知
+        send_message_anonymous_comment(@homework, m_status = 2)
+        Mailer.send_mail_anonymous_comment_open(@homework).deliver
       else
         @statue = 2
       end
@@ -218,19 +130,29 @@ class HomeworkCommonController < ApplicationController
   #关闭匿评
   def stop_anonymous_comment
     @homework_detail_manual.update_column('comment_status', 3)
-
+    #计算缺评扣分
     work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
     @homework.student_works.each do |student_work|
       absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
       student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0
       student_work.save
     end
-
+    # 匿评关闭消息邮件通知
+    send_message_anonymous_comment(@homework, m_status = 3)
+    Mailer.send_mail_anonymous_comment_close(@homework).deliver
     respond_to do |format|
       format.js
     end
   end
 
+  # 开启/关闭匿评消息通知
+  def send_message_anonymous_comment(homework, m_status )
+     # status 标记匿评状态 1为关闭 0为开启
+     course = @homework.course
+     course.student.each do |st|
+       @homework.course_messages << CourseMessage.new(:user_id => st.student_id, :course_id => course.id, :viewed => false, :status => m_status)
+     end
+  end
   #提示
   def alert_anonymous_comment
     @cur_size = 0
@@ -267,6 +189,27 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  #启动匿评参数设置
+  def start_evaluation_set
+
+  end
+
+  #设置匿评参数
+  def set_evaluation_attr
+    if @homework_detail_manual
+      unless params[:evaluation_start].to_s == @homework_detail_manual.evaluation_start.to_s
+        @homework_detail_manual.evaluation_start = params[:evaluation_start]
+      end
+
+      unless @homework_detail_manual.evaluation_end.to_s == params[:evaluation_end].to_s
+        @homework_detail_manual.evaluation_end = params[:evaluation_end]
+      end
+
+      @homework_detail_manual.evaluation_num = params[:evaluation_num]
+      @homework_detail_manual.save
+    end
+  end
+
   private
   #获取课程
   def find_course

app/controllers/issues_controller.rb

@@ -394,6 +394,9 @@ class IssuesController < ApplicationController
       jour.notes = params[:notes]
       jour.journalized = @issue
       jour.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@issue.id}").first
+      user_activity.updated_at = jour.created_on
+      user_activity.save
       @user_activity_id = params[:user_activity_id]
       respond_to do |format|
         format.js

app/controllers/messages_controller.rb

@@ -161,6 +161,9 @@ class MessagesController < ApplicationController
     @reply.content = @quote + @reply.content
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     @topic.children << @reply
+    user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
+    user_activity.updated_at = Time.now
+    user_activity.save
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/projects_controller.rb

@@ -33,7 +33,7 @@ class ProjectsController < ApplicationController
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
-  before_filter :memberAccess, only: :member
+  # before_filter :memberAccess, only: :member
 
   # accept_rss_auth :index
   accept_api_auth :index, :show, :create, :update, :destroy
@@ -216,6 +216,7 @@ class ProjectsController < ApplicationController
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
+        format.js
       end
     else
       respond_to do |format|
@@ -258,7 +259,8 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-
+    # 更新消息为已读
+    update_message_status(User.current, @project)
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -357,24 +359,57 @@ class ProjectsController < ApplicationController
 
   end
 
+  # 项目邀请用户加入实现过程
   # 两种情况：1、系统外用户；2、系统内用户 (通过邮件判定)
   def send_mail_to_member
+    # 该邮箱未注册过
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
+      if !User.where("login =?", params[:mail]).first.nil?
+        # 用户名唯一，用户修改邮箱，未修改用户名，用户名等同邮箱的情况，默认改用户已经注册
+        user = User.find_by_login(params[:mail].to_s)
+        if !user.member_of?(@project)
+          # 如果已经邀请过该用户，则不重复发送
+          if InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first.nil?
             email = params[:mail]
-      Mailer.run.send_invite_in_project(email, @project, User.current)
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        else
+          flash[:error] = l(:label_member_of_project, :value => email)
+        end
+      else
+        email = params[:mail]
+        Mailer.send_invite_in_project(email, @project, User.current).deliver
         @is_zhuce = false
         flash[:notice] = l(:notice_email_sent, :value => email)
+      end
+
+    # 邮箱地址已被注册
     elsif !User.find_by_mail(params[:mail].to_s).nil?
       user = User.find_by_mail(params[:mail].to_s)
       if !user.member_of?(@project)
+        # 如果已经邀请过该用户，则不重复发送
+        invite_list = InviteList.where("project_id =? and mail =?", @project.id, params[:mail].to_s).first
+        if invite_list.nil?
           email = params[:mail]
-        Mailer.run.request_member_to_project(email, @project, User.current)
+          Mailer.request_member_to_project(email, @project, User.current).deliver
           flash[:notice] = l(:notice_email_sent, :value => email)
+        else
+          # 已经发送过了，则隔3小时才能再次发送
+          if Time.now - invite_list.created_at > 10800
+            email = params[:mail]
+            Mailer.request_member_to_project(email, @project, User.current).deliver
+            flash[:notice] = l(:notice_email_sent, :value => email)
+          else
+            flash[:error] = l(:notice_email_invited)
+          end
+        end
       else
         flash[:error] = l(:label_member_of_project, :value => email)
       end
     else
-      flash[:error] = l(:notice_registed_error, :value => email)
       @is_zhuce = true
     end
     respond_to do |format|
@@ -382,25 +417,26 @@ class ProjectsController < ApplicationController
     end
   end
 
-  #发送邮件邀请新用户
+  # 发送邮件邀请新用户页面对应方法
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?
-      @inviter_lists = InviteList.where(project_id:@project.id).all
-      @inviters = []
-      @waiters = []
-      unless @inviter_lists.blank?
-        @inviter_lists.each do|inviter_list|
-          unless inviter_list.user.nil?
-            if inviter_list.user.member_of?(@project)
-              @inviters << inviter_list.user
-              @inviters_count = @inviters.size
-            else
-              @waiters << inviter_list.user
-              @waiters_count = @waiters.size
-            end
-          end
-        end
-      end
+      @inviter_lists = InviteList.where(project_id:@project.id).order("created_at desc")
+
+      # @inviters = []
+      # @waiters = []
+      # unless @inviter_lists.blank?
+      #   @inviter_lists.each do|inviter_list|
+      #     unless inviter_list.user.nil?
+      #       if inviter_list.user.member_of?(@project)
+      #         @inviters << inviter_list.user
+      #         @inviters_count = @inviters.size
+      #       else
+      #         @waiters << inviter_list.user
+      #         @waiters_count = @waiters.size
+      #       end
+      #     end
+      #   end
+      # end
       @is_zhuce = false
       respond_to do |format|
         format.html
@@ -412,16 +448,16 @@ class ProjectsController < ApplicationController
   end
 
   # 邀请Trustie注册用户
-  def invite_members
-    if User.current.member_of?(@project) || User.current.admin? 
-      @member ||= @project.members.new
-        respond_to do |format|
-        format.html
-      end
-    else
-      render_403
-    end
-  end
+  # def invite_members
+  #   if User.current.member_of?(@project) || User.current.admin?
+  #     @member ||= @project.members.new
+  #       respond_to do |format|
+  #       format.html
+  #     end
+  #   else
+  #     render_403
+  #   end
+  # end
 
   def edit
   end
@@ -429,6 +465,11 @@ class ProjectsController < ApplicationController
   # by young
   # include CoursesHelper
   def member
+    # 消息"同意加入项目"
+    if params[:message_id]
+      message_invite(params[:message_id], params[:key])
+    end
+    update_message_status(User.current, @project)
     # params[:login]为邮箱邀请用户加入，主要功能：
     # 1、自动注册
     # 2、加入项目、创建角色
@@ -450,6 +491,10 @@ class ProjectsController < ApplicationController
         flash[:notice] = l(:label_mail_invite_success)
       end
     end
+    # 私有项目非项目成员无法访问成员列表
+    unless @project.is_public?
+      return render_403 unless User.current.member_of?(@project)
+    end
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'project_member_list'
     # 判断是否课程
@@ -480,6 +525,24 @@ class ProjectsController < ApplicationController
     @members = paginateHelper @members
   end
 
+  def update_message_status(user, project)
+    project_invite_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =?", user, project, "ProjectInvite")
+    project_invite_messages.each do |project_invite_message|
+      project_invite_message.update_attribute(:viewed, true)
+    end
+  end
+
+  def message_invite(message_id, key)
+    forge_message = ForgeMessage.find(message_id)
+    if key == forge_message.secret_key
+      # 情况：用户收到邀请邮件还没看，但是管理员已经把该用户添加进项目
+      if Member.where("user_id =? and project_id =?",forge_message.user_id, forge_message.project_id).first.nil?
+        Member.create(:role_ids => [4], :user_id => forge_message.user_id, :project_id => forge_message.project_id)
+        UserGrade.create(:user_id => forge_message.user_id, :project_id => forge_message.project_id)
+      end
+    end
+  end
+
   #判断指定用户是否为课程教师
   def isCourseTeacher(id)
      result = false

app/controllers/student_work_controller.rb

@@ -3,12 +3,11 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule]
   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]
-  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list]
-  protect_from_forgery :except => :set_program_score
+  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule]
 
   ### 
   def program_test
@@ -72,8 +71,13 @@ class StudentWorkController < ApplicationController
         query.update_attributes(:viewed => true)
       end
     end
+    ##################################################################################################################
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @homework_commons = @course.homework_commons.order("created_at desc")
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+    @is_evaluation = @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
+    @show_all = false
+
     course_group = CourseGroup.find_by_id(@group) if @group
     if course_group
       group_students = course_group.users
@@ -82,71 +86,51 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      #老师 || 非匿评作业 || 匿评结束 显示所有的作品
-      @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3 || User.current.admin?
-      if @show_all
-        if @homework.homework_type == 1 || @is_teacher || User.current.admin? #超级管理员 || 老师 || 匿评结束 显示所有的作品
-          if @order == "name"
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
-          else
+      if @is_teacher   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
-          end
-        else #剩余情况： 学生 && 非匿评作业 如果未提交作品，只能看到自己的，提交了作品，能看到所有作品
+        @show_all = true
+      elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
+        @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
+        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}
+      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
         my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
         if my_work.empty?
           @stundet_works = []
-          else
-            if @order == "name"
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
         else
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+          @show_all = true
         end
+      else
+        @stundet_works = []
       end
-        end
-      else #学生
-        if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
+    else
+      if @is_teacher   #老师 || 超级管理员 显示所有列表
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+        @show_all = true
+      elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
         @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
-        elsif @homework.homework_detail_manual.comment_status == 2 #匿评列表，显示匿评作品和我的作品
-          @is_evaluation = true
+      elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
         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
-    else
-      #老师 || 非匿评作业 || 匿评结束 显示所有的作品
-      @show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3 || User.current.admin?
-      if @show_all
-        if @homework.homework_type == 1 || @is_teacher || User.current.admin? #超级管理员 || 老师 || 匿评结束 显示所有的作品
-          if @order == "name"
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
-          else
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
-          end
-        else #剩余情况： 学生 && 非匿评作业 如果未提交作品，只能看到自己的，提交了作品，能看到所有作品
+      elsif @homework.homework_detail_manual.comment_status == 3  #学生 && 关闭匿评  未提交作品之前列表为空，提交了作品看到所有的
         my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
         if my_work.empty?
           @stundet_works = []
-          else
-            if @order == "name"
-              @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
         else
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+          @show_all = true
         end
+      else
+        @stundet_works = []
       end
     end
-      else #学生
-        if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
-          @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").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
-    end
-    @homework_commons = @course.homework_commons.order("created_at desc")
+
     @score = @b_sort == "desc" ? "asc" : "desc"
+
     respond_to do |format|
+      format.js
       format.html
       format.xls {
         send_data(homework_to_xls(@stundet_works), :type => "text/excel;charset=utf-8; header=present",
@@ -180,15 +164,15 @@ class StudentWorkController < ApplicationController
       student_work.homework_common_id = @homework.id
       student_work.user_id = User.current.id
       student_work.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(student_work)
+      #提交作品时，计算是否迟交
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
         student_work.late_penalty = @homework.late_penalty
       else
         student_work.late_penalty = 0
       end
-      render_attachment_warning_if_needed(student_work)
 
       if student_work.save
-
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -241,16 +225,15 @@ class StudentWorkController < ApplicationController
 
   def show
     @score = student_work_score @work,User.current
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
+    @student_work_scores = @work.student_works_scores.order("updated_at desc")
     respond_to do |format|
       format.js
     end
   end
 
   def destroy
-    if @homework.homework_type == 2  #编程作业，作品提交后不可以删除
-      render_403
-    elsif @work.destroy
+    if @work.destroy
       respond_to do |format|
         format.html {
           redirect_to student_work_index_url(:homework => @homework.id)
@@ -261,10 +244,11 @@ class StudentWorkController < ApplicationController
 
   #添加评分，已评分则为修改评分
   def add_score
+    @is_last = params[:is_last] == "true"
     render_403 and return if User.current == @work.user #不可以匿评自己的作品
-    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分
-    render_403 and return unless @is_teacher || (@homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2)
+    render_403 and return unless @is_teacher || @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] != ""
@@ -298,35 +282,11 @@ class StudentWorkController < ApplicationController
       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
-              ta_proportion = @homework.homework_detail_manual.ta_proportion if @homework.homework_detail_manual
-              ta_proportion = @homework.homework_detail_programing.ta_proportion if @homework.homework_detail_programing
-              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
-              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{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
@@ -338,6 +298,7 @@ class StudentWorkController < ApplicationController
   #添加评分的回复
   def add_score_reply
     @score = StudentWorksScore.find params[:score_id]
+    @is_last = params[:is_last] == "true"
     @jour = @score.journals_for_messages.new(:user_id => User.current.id,:notes =>params[:message], :reply_id => 0)
     if @jour.save
       @status = 1
@@ -430,43 +391,52 @@ class StudentWorkController < ApplicationController
     end
   end
 
-  #设置编程作业得分
-  def set_program_score
-    stundet_work = StudentWork.find_by_id params[:student_work_id]
-    @course = stundet_work.homework_common.course
-    student_score_count = 0
-    if stundet_work && params[:results] && params[:results].class.to_s == "Array"
-      homework_common = stundet_work.homework_common
-      params[:results].each do |result|
-        homework_tests = homework_common.homework_tests.where("input = '#{result[:input]}' AND output = '#{result[:output]}'")
-        homework_tests.each do |homework_test|
-          student_work_test = StudentWorkTest.new
-          student_work_test.student_work = stundet_work
-          student_work_test.homework_test = homework_test
-          student_work_test.result = result[:status]
-          if student_work_test.result == 0
-            student_score_count += 1
-          end
-          student_work_test.error_msg = params[:compile_error_msg]
-          student_work_test.save!
+  #设置评分规则
+  def set_score_rule
+    homework_detail_manual = @homework.homework_detail_manual
+    homework_detail_programing = @homework.homework_detail_programing
+
+    unless @homework.late_penalty.to_s == params[:late_penalty].to_s
+      @homework.late_penalty = params[:late_penalty]
+      @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work|
+        student_work.late_penalty = @homework.late_penalty
+        student_work.save
       end
+
+      @homework.save
     end
-      unless homework_common.homework_tests.empty?
-        stundet_work.student_score = student_score_count * 100.0 / homework_common.homework_tests.count
 
-        if stundet_work.teacher_score.nil?
-          if stundet_work.teaching_asistant_score.nil?
-            stundet_work.final_score = stundet_work.student_score
-          else
-            final_ta_score = BigDecimal.new("#{stundet_work.teaching_asistant_score}") * BigDecimal.new("#{homework_common.homework_detail_programing.ta_proportion}")
-            final_s_score = BigDecimal.new("#{stundet_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework_common.homework_detail_programing.ta_proportion}"))
-            final_score = final_ta_score + final_s_score
-            stundet_work.final_score = format("%.1f",final_score.to_f)
+    unless homework_detail_manual.absence_penalty.to_s == params[:absence_penalty].to_s
+      homework_detail_manual.absence_penalty = params[:absence_penalty]
+      if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值
+        work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
+        @homework.student_works.each do |student_work|
+          absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count
+          student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0
+          student_work.save
         end
       end
 
-        stundet_work.save!
+      homework_detail_manual.save if homework_detail_manual
     end
+
+    teacher_priority = params[:teacher_priority] ? 1 : 0
+    if homework_detail_manual.ta_proportion.to_s != params[:ta_proportion].to_s || @homework.teacher_priority.to_s != teacher_priority.to_s || (homework_detail_programing && homework_detail_programing.ta_proportion.to_s != params[:sy_proportion].to_s)
+      homework_detail_manual.ta_proportion = params[:ta_proportion]
+      homework_detail_programing.ta_proportion = params[:sy_proportion] if homework_detail_programing
+      @homework.teacher_priority = teacher_priority
+
+      @homework.save
+      homework_detail_manual.save if homework_detail_manual
+      homework_detail_programing.save if homework_detail_programing
+
+      @homework.student_works.each do |student_work|
+        set_final_score @homework,student_work
+        student_work.save
+      end
+    end
+    respond_to do |format|
+      format.html{redirect_to student_work_index_url(:homework => @homework.id)}
     end
   end
 
@@ -500,15 +470,19 @@ class StudentWorkController < ApplicationController
   end
 
   def teacher_of_course
-    render_403 unless User.current.allowed_to?(:as_teacher,@course)
+    render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
   #根据条件过滤作业结果
   def search_homework_member homeworks,name
+    if name == ""
+      select_homework = homeworks
+    else
       name = name.downcase
       select_homework = homeworks.select{ |homework|
         homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
       }
+    end
     select_homework
   end
 
@@ -519,25 +493,7 @@ class StudentWorkController < ApplicationController
     sheet1 = book.create_worksheet :name => "homework"
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
     sheet1.row(0).default_format = blue
-    if @homework.homework_type == 0 #普通作业
-      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_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,8] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-        sheet1[count_row,9] = format_time(homework.created_at)
-        count_row += 1
-      end
-    elsif @homework.homework_type == 1 #匿评作业
+    if @homework.homework_type == 1 #匿评作业
       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
@@ -557,7 +513,7 @@ class StudentWorkController < ApplicationController
       end
     elsif @homework.homework_type == 2 #编程作业
       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_s_score),l(:excel_f_score),l(:excel_commit_time)])
+                            l(:excel_t_score),l(:excel_ta_score), l(:excel_s_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
@@ -568,9 +524,10 @@ class StudentWorkController < ApplicationController
         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.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
-        sheet1[count_row,10] = format_time(homework.created_at)
+        sheet1[count_row,8] = homework.system_score.nil? ? l(:label_without_score) : format("%.2f",homework.system_score)
+        sheet1[count_row,9] = homework.student_score.nil? ? l(:label_without_score) : format("%.2f",homework.student_score)
+        sheet1[count_row,10] = homework.respond_to?("score") ? homework.score.nil? ? l(:label_without_score) : format("%.2f",homework.score) : l(:label_without_score)
+        sheet1[count_row,11] = format_time(homework.created_at)
         count_row += 1
       end
     end
@@ -670,4 +627,103 @@ class StudentWorkController < ApplicationController
     end
     JSON.parse(res.body)
   end
+
+  #成绩计算
+  def set_final_score homework,student_work
+    if homework && homework.homework_detail_manual
+      if homework.homework_type == 1 #匿评作业
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.student_score
+            elsif student_work.student_score.nil?
+              student_work.final_score = student_work.teaching_asistant_score
+            else
+              ta_proportion = homework.homework_detail_manual.ta_proportion
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil?
+            student_work.final_score = student_work.student_score
+          elsif student_work.student_score.nil?
+            student_work.final_score = student_work.teaching_asistant_score
+          else
+            ta_proportion = homework.homework_detail_manual.ta_proportion
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_ta_score + final_s_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil? #教辅未评分
+              if student_work.student_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_st_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            elsif student_work.student_score.nil? #学生未评分
+              if student_work.teaching_asistant_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_ts_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            else
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_sy_score + final_ts_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          elsif student_work.student_score.nil? #学生未评分
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_ts_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            final_score = final_sy_score + final_ts_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      end
+    end
+  end
 end

app/controllers/system_messages_controller.rb

@@ -38,14 +38,15 @@ class SystemMessagesController < ApplicationController
       return
     end
     @system_messages = SystemMessage.new
-    @system_messages.content = params[:system_message][:content]
+    @system_messages.description = params[:system_message][:description]
+    @system_messages.subject = params[:system_message][:subject]
     @system_messages.user_id = User.current.id
     respond_to do |format|
       if @system_messages.save
-        format.html {redirect_to user_message_path(User.current, :type => "system_messages")}
+        format.html {redirect_to user_system_messages_path(User.current)}
         flash[:notice] = l(:notice_successful_message)
       else
-        if params[:system_message][:content].empty?
+        if params[:system_messages][:description].empty?
           flash[:error] = l(:label_content_blank_fail)
         else
           flash[:error] = l(:label_admin_message_fail)

app/controllers/users_controller.rb

@@ -40,7 +40,7 @@ class UsersController < ApplicationController
                                       :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                       :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                       :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource]
+                                      :user_import_homeworks,:user_search_homeworks,:user_import_resource, :user_system_messages]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -95,24 +95,28 @@ class UsersController < ApplicationController
   # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
   def user_messages
-    unless User.current.logged?
+    if !User.current.logged?
       redirect_to signin_url
       return
+    elsif @user != User.current && !User.current.admin?
+     return render_403
     end
     # 记录当前点击按钮的时间
     # 考虑到用户未退出刷新消息页面
-    if OnclickTime.where("user_id =?", User.current).first.nil?
+    message_time = OnclickTime.where("user_id =?", User.current).first
+    if message_time.nil?
       message_new_time = OnclickTime.new
       message_new_time.user_id = User.current.id
       message_new_time.onclick_time = Time.now
       message_new_time.save
     else
-      message_new_time = OnclickTime.where("user_id =?", User.current).first
-      message_last_time = message_new_time.onclick_time
-      message_new_time.update_attributes(:onclick_time => Time.now)
+      # 24小时内显示
+      contrast_time = Time.now - 86400
+      message_time.update_attributes(:onclick_time => Time.now)
     end
-    @user_system_messages = SystemMessage.where("created_at >?", message_last_time).order("created_at desc")
+    @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
     # 当前用户查看消息，则设置消息为已读
+    # DO 待优化，只需查出符合条件的再更新
     if params[:viewed] == "all"
       course_querys = @user.course_messages
       forge_querys = @user.forge_messages
@@ -142,8 +146,8 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
-      when 'system_messages'
-        @message_alls = SystemMessage.order("created_at desc").all
+      # when 'system_messages'
+      #   @message_alls = SystemMessage.order("created_at desc").all
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
@@ -193,6 +197,15 @@ class UsersController < ApplicationController
     end
   end
 
+  # 系统消息
+  def user_system_messages
+    @sytem_messages = SystemMessage.order("created_at desc").all
+    @sytem_messages = paginateHelper @sytem_messages, 10
+    respond_to do |format|
+      format.html{render :layout=>'new_base_user'}
+    end
+  end
+
   def user_projects_index
     if User.current.admin?
       memberships = @user.memberships.all(conditions: "projects.project_type = #{Project::ProjectType_project}").first
@@ -419,6 +432,14 @@ class UsersController < ApplicationController
     homework = HomeworkCommon.find(params[:homework])
     student_work = StudentWork.where(homework_common_id: homework.id, user_id: User.current.id).first
     if student_work
+
+      #提交作品时，计算是否迟交
+      if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
+        student_work.late_penalty = 1
+      else
+        student_work.late_penalty = 0
+      end
+
       student_work.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to student_work_index_url(:homework => params[:homework])
@@ -436,7 +457,8 @@ class UsersController < ApplicationController
         homework.end_time = params[:homework_common][:end_time] || Time.now
         homework.publish_time = Time.now
         homework.homework_type = params[:homework_type].to_i || 1
-        homework.late_penalty = 2
+        homework.late_penalty = 10
+        homework.teacher_priority = 1
         homework.user_id = User.current.id
         homework.course_id = params[:course_id]
 
@@ -444,19 +466,19 @@ class UsersController < ApplicationController
         render_attachment_warning_if_needed(homework)
 
         homework_detail_manual = HomeworkDetailManual.new
-        homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
+        homework_detail_manual.ta_proportion = homework.homework_type == 1 ? 0.6 : 0.3
         homework_detail_manual.comment_status = 1
-        homework_detail_manual.evaluation_start = Time.now
-        homework_detail_manual.evaluation_end = Time.now
+        homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? homework.end_time + 7 : params[:evaluation_start]
+        homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
         homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
-        homework_detail_manual.absence_penalty = 2
+        homework_detail_manual.absence_penalty = 5
         homework.homework_detail_manual = homework_detail_manual
 
         #编程作业相关属性
         if homework.homework_type == 2
           homework_detail_programing = HomeworkDetailPrograming.new
           homework.homework_detail_programing = homework_detail_programing
-          homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
+          homework_detail_programing.ta_proportion = 0.5
           homework_detail_programing.language = params[:language_type].to_i
 
           inputs = params[:program][:input]
@@ -613,12 +635,11 @@ class UsersController < ApplicationController
       redirect_to signin_url
       return
     end
-    # 更新用户留言消息状态
-    @user.journals_for_messages.each do |jour_message|
-      jour_message.user_feedback_messages.each do |userfeedback_message|
-        if User.current.id == userfeedback_message.user_id
-          userfeedback_message.update_attributes(:viewed => true)
-        end
+    # 自己访问自己的页面才更新消息状态
+    if User.current == @user
+      journals_messages =  UserFeedbackMessage.where("user_id =? and journals_for_message_type =? and viewed =?", User.current.id, "JournalsForMessage", 0)
+      journals_messages.each do |journals_message|
+        journals_message.update_attributes(:viewed => true)
       end
     end
     # end
@@ -845,24 +866,24 @@ class UsersController < ApplicationController
     if params[:type].present?
       case params[:type]
         when "course_homework"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'HomeworkCommon'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_news"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'News'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_message"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_poll"
-          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_issue"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_message"
-          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "current_user"
-          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))").order('updated_at desc').limit(10).offset(@page * 10)
         else
-          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+          @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
       end
     else
-      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('created_at desc').limit(10).offset(@page * 10)
+      @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})").order('updated_at desc').limit(10).offset(@page * 10)
     end
     # @user_activities = paginateHelper @user_activities,500
     @type = params[:type]

app/controllers/zipdown_controller.rb

@@ -1,4 +1,4 @@
-require 'zip'
+require 'zip'
 class ZipdownController < ApplicationController
   #查找项目（课程）
   before_filter :find_project_by_bid_id, :only => [:assort]

app/helpers/application_helper.rb

@@ -2297,27 +2297,19 @@ module ApplicationHelper
 
   #获取匿评相关连接代码
   def homework_anonymous_comment homework
-    # if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业
-    #
-    # elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
-    #   link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
-    # else
-    #   link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
-    # end
-
     if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
-      link = "<span class='fr mr10 pr_join_span ' title='作业截止日期之前不可以启动匿评'>启动匿评</span>".html_safe
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif 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'
+        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
       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'
+        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
-          link = "<span class='fr  pr_join_span mr10' title='匿评结束'>匿评结束</span>".html_safe
+        # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
     else
-      link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于2时才可以启动匿评"
     end
     link
   end
@@ -2325,14 +2317,18 @@ module ApplicationHelper
   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'
+      link_to "提交作品",  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
-      elsif homework.homework_type == 2 #编程作业不能修改作品
-        "<span class='fr mr10 pr_join_span ' title='编程作业不可修改作品'>作品已交</span>".html_safe
+        link_to "作品已交",  "javascript:void(0);", :class => 'fr mr10 pr_join_span c_white', :title => "开启匿评后不可修改作品"
+      elsif homework.homework_type == 2 #编程作业修改作品
+        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1
+          link_to "作品已交",  "javascript:void(0);", :class => 'fr mr10 pr_join_span c_white', :title => "开启匿评后不可修改作品"
+        else
+          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
+        end
       else
-        link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit c_blue'
+        link_to "修改作品",  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
       end
     end
   end
@@ -2345,9 +2341,9 @@ module ApplicationHelper
     homework = default_opt[:homework]
     work = cur_user_works_for_homework homework
     if work.nil? && !is_teacher
-      link_to "提交("+homework.student_works.count.to_s+")", new_student_work_path(:homework => homework.id), :class=> default_opt[:class]
+      link_to "提交("+homework.student_works.count.to_s+")", new_student_work_path(:homework => homework.id,:host=> Setting.host_course), :class=> default_opt[:class]
     else
-      link_to "提交("+homework.student_works.count.to_s+")", student_work_index_path(:homework => homework.id), :class=> default_opt[:class]
+      link_to "提交("+homework.student_works.count.to_s+")", student_work_index_path(:homework => homework.id,:host=> Setting.host_course), :class=> default_opt[:class]
     end
   end
 
@@ -2363,7 +2359,7 @@ module ApplicationHelper
         if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
           link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
-          link_to "作品已交",  student_work_index_path(:homework => homework.id),:class => 'c_blue',:title => "编程作业不可修改作品"
+          link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else
           link_to "修改作品",  edit_student_work_path(work.id),:class => 'c_blue'
         end
@@ -2372,7 +2368,7 @@ module ApplicationHelper
   end
 
   def student_anonymous_comment homework
-    if homework.homework_type == 1 && homework.homework_detail_manual
+    if  homework.homework_detail_manual
       case homework.homework_detail_manual.comment_status
         when 1
           "<span class='fr mr10 pr_join_span '>未开启匿评</span>".html_safe
@@ -2381,10 +2377,6 @@ module ApplicationHelper
         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 '>&nbsp;编程作业&nbsp;&nbsp;</span>".html_safe
     end
   end
 

app/helpers/projects_helper.rb

@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 include AvatarHelper
+include StudentWorkHelper
 module ProjectsHelper
   def link_to_version(version, options = {})
     return '' unless version && version.is_a?(Version)
@@ -75,6 +76,17 @@ module ProjectsHelper
     return result
   end
 
+# 被邀请成员的状态
+  def status_for_ivitied(ivite_list, project)
+    if ivite_list.user.member_of?(project)
+      value = "已经加入了项目！"
+    elsif ivite_list.user.active?
+      value = "邀请已发送，等待用户加入！"
+    else
+      value = "邀请已发送，等待用户激活账号！"
+    end
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},

app/helpers/student_work_helper.rb

@@ -2,17 +2,16 @@
 include UserScoreHelper
 
 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)
+    projects = User.current.projects.visible
     not_have_project = []
-    not_have_project << Setting.please_chose
+    not_have_project << "请选择关联项目"
     not_have_project << 0
     type = []
     type << not_have_project
     projects.each do |project|
-      if project != nil
+      if project
         option = []
         option <<  project.name
         option <<  project.id
@@ -100,4 +99,31 @@ module StudentWorkHelper
     end
     result
   end
+
+  #教辅评分比例下拉框
+  def ta_proportion_option
+    type = []
+    i = 0
+    while  i <= 100
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
+
+  def ta_proportion_option_to num
+    type = []
+    i = 0
+    while  i <= num
+      option = []
+      option << i.to_s + "%"
+      option << i.to_f / 100
+      type << option
+      i += 10
+    end
+    type
+  end
 end

app/models/forge_message.rb

@@ -8,7 +8,7 @@ class ForgeMessage < ActiveRecord::Base
   TYPE_OF_WIKI_ACT = "Wiki"
   TYPE_OF_NEWS_ACT = "News"
 
-  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed
+  attr_accessible :forge_message_id, :forge_message_type, :project_id, :user_id, :viewed, :secret_key
 
   belongs_to :forge_message ,:polymorphic => true
   belongs_to :project

app/models/homework_detail_programing.rb

@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   belongs_to :homework_common
 
   def language_name
-    %W(c c++).at(self.language.to_i - 1)
+    %W(C C++ Python).at(self.language.to_i - 1)
   end
 end

app/models/invite_list.rb

@@ -1,5 +1,5 @@
 class InviteList < ActiveRecord::Base
-  attr_accessible :project_id, :user_id
+  attr_accessible :project_id, :user_id, :mail
   belongs_to :user
   belongs_to :project
 

app/models/issue.rb

@@ -1399,6 +1399,7 @@ class Issue < ActiveRecord::Base
   def attachment_added(obj)
     if @current_journal && @current_journal.user_id == obj.author_id && JournalDetail.find_all_by_value(obj.filename).count == 0
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)
+
     end
   end
 
@@ -1407,6 +1408,9 @@ class Issue < ActiveRecord::Base
     if @current_journal && !obj.new_record?
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :old_value => obj.filename)
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
     end
   end
 
@@ -1513,6 +1517,9 @@ class Issue < ActiveRecord::Base
         }
       end
       @current_journal.save
+      user_activity = UserActivity.where("act_type='Issue' and act_id =#{@current_journal.journalized_id}").first
+      user_activity.updated_at = Time.now
+      user_activity.save
       # reset current journal
       init_journal @current_journal.user, @current_journal.notes
     end

app/models/journals_for_message.rb

@@ -190,13 +190,45 @@ class JournalsForMessage < ActiveRecord::Base
     end
   end
 
-  # 课程作品留言消息通知
+  # 课程/作品回复 留言消息通知
   def act_as_course_message
     if self.jour_type == 'StudentWorksScore'
       if self.user_id != self.jour.user_id
         self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.student_work.homework_common.course.id, :viewed => false)
       end
     end
+    # 课程留言
+    if self.jour_type == 'Course'
+      receivers = []
+      teachers = []
+      # 获取课程的老师
+      self.jour.members.each do |m|
+        if m.user.allowed_to?(:as_teacher, self.jour)
+          teachers << m
+        end
+      end
+      if self.reply_id == 0  # 主留言，即不是回复某条留言
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id
+            receivers << teacher.user_id
+          end
+        end
+      else # 留言回复
+        reply_to = User.find(self.reply_id)
+        if self.user_id != self.reply_id # 添加我回复的那个人
+          receivers << reply_to.id
+        end
+        # 给老师发送。 过滤条件：老师自己给自己发；回复对象为老师则排除改老师
+        teachers.each do |teacher|
+          if teacher.user_id != self.user_id && self.reply_id != teacher.user_id
+            receivers << teacher.user_id
+          end
+        end
+      end
+      receivers.each do |r|
+        self.course_messages << CourseMessage.new(:user_id => r, :course_id => self.jour.id, :viewed => false)
+      end
+    end
   end
 
   # 用户留言消息通知

app/models/mailer.rb

@@ -47,8 +47,44 @@ class Mailer < ActionMailer::Base
     MailerProxy.new(self)
   end
 
+  # 作业匿评开启
+  def send_mail_anonymous_comment_open(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    course.student.each do |student|
+      user = User.find(student.student_id)
+      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @token = Token.get_token_from_user(user, 'autologin')
+      @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+      @anonymous_comment_close_name = homework_common.name
+      @author = homework_common.user
+      #收件人邮箱
+      recipients << user.mail
+    end
+    mail :to => recipients,
+         :subject => @subject
+  end
+
+  # 作业匿评关闭
+  def send_mail_anonymous_comment_close(homework_common)
+    course = homework_common.course
+    recipients ||= []
+    course.student.each do |student|
+      user = User.find(student.student_id)
+      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @token = Token.get_token_from_user(user, 'autologin')
+      @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+      @anonymous_comment_close_name = homework_common.name
+      @author = homework_common.user
+      #收件人邮箱
+      recipients << user.mail
+    end
+    mail :to => recipients,
+         :subject => @subject
+  end
+
   # author: alan
-  # 发送邀请未注册用户加入项目邮件
+  # 邀请未注册用户加入项目
   # 功能： 在加入项目的同时自动注册用户
   def send_invite_in_project(email, project, invitor)
     @email = email
@@ -59,8 +95,8 @@ class Mailer < ActionMailer::Base
     login = login.sub(/%40/,'@')
     us = UsersService.new
     # 自动激活用户
-    user = us.register_auto(login, @email, @password)
-    InviteList.create(:user_id => user.id, :project_id => project.id)
+    user = us.register_auto(login, email, @password)
+    InviteList.create(:user_id => user.id, :project_id => project.id, :mail =>email)
     User.current = user unless User.current.nil?
     @user = user
     @token = Token.get_token_from_user(user, 'autologin')
@@ -76,15 +112,23 @@ class Mailer < ActionMailer::Base
     @project_name = "#{project.name}"
     @user = user
     @project = project
-    inviter_lists = InviteList.where(project_id:@project.id, user_id:@user.id).all
-    if inviter_lists.blank?
-      InviteList.create(:user_id => user.id, :project_id => project.id)
+    if InviteList.where("project_id= ? and user_id =? and mail =?", project.id, @user.id, email).first.nil?
+      InviteList.create(:user_id => user.id, :project_id => project.id, :mail => email)
     end
     @token = Token.get_token_from_user(user, 'autologin')
     @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
+    # 发送消息邀请
+    send_message_request_member(user,project)
+    # end
     mail :to => email, :subject => @subject
   end
 
+  # 邀请信息消息 注：forge_message_id 为邀请人ID(特殊情况)
+  def send_message_request_member(user, project)
+    key = newpass(6).to_s
+    ForgeMessage.create(:user_id => user.id, :project_id => project.id, :forge_message_type => "ProjectInvite",:forge_message_id => User.current.id, :viewed => false, :secret_key =>key)
+  end
+
   # author: alan
   # 根据用户选择发送个人日报或周报
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
@@ -208,6 +252,20 @@ class Mailer < ActionMailer::Base
     mail :to => user.mail,:subject => subject if has_content
   end
 
+  # 作业截止时间邮件提醒
+  def homework_endtime__added(homework_common, user_id)
+    user = User.find(user_id)
+    @subject = "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+    @token = Token.get_token_from_user(user, 'autologin')
+    @homework_endtime_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
+    @homework_endtime_name = homework_common.name
+    @author = homework_common.user
+    #收件人邮箱
+    recipient = user.mail
+    mail :to => recipient,
+         :subject => "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+  end
+
   # 公共讨论区发帖、回帖添加邮件发送信息
   def forum_message_added(memo)
     @memo = memo

app/models/member.rb

@@ -30,6 +30,9 @@ class Member < ActiveRecord::Base
   validate :validate_role
 
   before_destroy :set_issue_category_nil
+  # 删除项目成员一并删除该成员的邀请记录
+  after_destroy :delete_ivite_list
+
 
   def role
   end
@@ -97,6 +100,16 @@ class Member < ActiveRecord::Base
     end
   end
 
+  # 删除成员一并删除该成员的邀请信息
+  def delete_ivite_list
+    member_invite_lists = InviteList.where("user_id =? and project_id =?", self.user_id, self.project_id)
+    unless member_invite_lists.nil?
+      member_invite_lists.each do |member_invite_list|
+        member_invite_list.destroy
+      end
+    end
+  end
+
   # Find or initilize a Member with an id, attributes, and for a Principal
   def self.edit_membership(id, new_attributes, principal=nil)
     @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)

app/models/project.rb

@@ -66,8 +66,8 @@ class Project < ActiveRecord::Base
   # has_many :students_for_courses, :dependent => :destroy
   has_many :student, :through => :students_for_courses, :source => :user
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
-  has_many :applied_projects
-  has_many :invite_lists
+  has_many :applied_projects, :dependent => :destroy
+  has_many :invite_lists, :dependent => :destroy
   has_one :dts
 
   # end

app/models/student_work.rb

@@ -32,10 +32,108 @@ class StudentWork < ActiveRecord::Base
           self.system_score = last_test.test_score
         end
     end
-
+    set_final_score self.homework_common,self
   end
   def set_src
     self.description = last_test.src if last_test
   end
 
+  #成绩计算
+  def set_final_score homework,student_work
+    if homework && homework.homework_detail_manual
+      if homework.homework_type == 1 #匿评作业
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.student_score
+            elsif student_work.student_score.nil?
+              student_work.final_score = student_work.teaching_asistant_score
+            else
+              ta_proportion = homework.homework_detail_manual.ta_proportion
+              final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+              final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_ta_score + final_s_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil?
+            student_work.final_score = student_work.student_score
+          elsif student_work.student_score.nil?
+            student_work.final_score = student_work.teaching_asistant_score
+          else
+            ta_proportion = homework.homework_detail_manual.ta_proportion
+            final_ta_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+            final_s_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+            final_score = final_ta_score + final_s_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业-----设定：系统评分必定不为空
+        if homework.teacher_priority == 1 #教师优先
+          if student_work.teacher_score
+            student_work.final_score = student_work.teacher_score
+          else
+            if student_work.teaching_asistant_score.nil? #教辅未评分
+              if student_work.student_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_st_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            elsif student_work.student_score.nil? #学生未评分
+              if student_work.teaching_asistant_score.nil?
+                student_work.final_score = student_work.system_score
+              else
+                ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+                final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+                final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+                final_score = final_sy_score + final_ts_score
+                student_work.final_score = format("%.2f",final_score.to_f)
+              end
+            else
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+              final_score = final_sy_score + final_ts_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          end
+        else  #不考虑教师评分
+          if student_work.teaching_asistant_score.nil? #教辅未评分
+            if student_work.student_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + homework.homework_detail_manual.ta_proportion / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_st_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          elsif student_work.student_score.nil? #学生未评分
+            if student_work.teaching_asistant_score.nil?
+              student_work.final_score = student_work.system_score
+            else
+              ta_proportion = homework.homework_detail_programing.ta_proportion + (1.0 - homework.homework_detail_manual.ta_proportion - homework.homework_detail_programing.ta_proportion) / 2
+              final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{ta_proportion}")
+              final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+              final_score = final_sy_score + final_ts_score
+              student_work.final_score = format("%.2f",final_score.to_f)
+            end
+          else
+            final_sy_score = BigDecimal.new("#{student_work.system_score || 0}") * BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}")
+            final_ts_score = BigDecimal.new("#{student_work.teaching_asistant_score}") * BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}")
+            final_st_score = BigDecimal.new("#{student_work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{homework.homework_detail_programing.ta_proportion}") - BigDecimal.new("#{homework.homework_detail_manual.ta_proportion}"))
+            final_score = final_sy_score + final_ts_score + final_st_score
+            student_work.final_score = format("%.2f",final_score.to_f)
+          end
+        end
+      end
+    end
+  end
 end

app/models/student_work_test.rb

@@ -45,7 +45,7 @@ class StudentWorkTest < ActiveRecord::Base
   private
   def get_success_count
     self.results.inject(0) do |sum, result|
-      sum += (result["status"].to_i == 0 ? 1 : 0)
+      sum += (result["status"] && result["status"].to_i == 0 ? 1 : 0)
     end || 0
   end
 

app/models/system_message.rb

@@ -1,7 +1,8 @@
 class SystemMessage < ActiveRecord::Base
-  attr_accessible :content, :id, :user_id
+  attr_accessible :content, :id, :user_id, :description, :subject
   belongs_to :user
 
-  validates :content, presence: true
-  validates_length_of :content, maximum: 255
+  validates :subject, presence: true
+  # validates :description, presence: true
+  validates_length_of :description, maximum: 10000
 end

app/models/user.rb

@@ -140,7 +140,7 @@ class User < Principal
   has_many :issue_assigns, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Issue"'
   has_many :status_updates, :class_name => 'ForgeMessage', :conditions => 'viewed=0 and forge_message_type="Journal"'
   # 邮件邀请状态
-  # has_many :invite_lists
+  has_many :invite_lists,  :dependent => :destroy
   # end
 
 ######added by nie
@@ -213,6 +213,8 @@ class User < Principal
   # added by fq
   after_create :act_as_activity, :add_onclick_time
   # end
+  # 更新邮箱用户或用户名的同事，同步更新邀请信息
+  after_update :update_invite_list
 
   scope :in_group, lambda {|group|
     group_id = group.is_a?(Group) ? group.id : group.to_i
@@ -1010,6 +1012,16 @@ class User < Principal
     end
   end
 
+  # 更新邮箱的同事，更新invite_lists表中的邮箱信息
+  def update_invite_list
+    invite_lists = InviteList.where("user_id =?",self.id).all
+    unless invite_lists.blank?
+      invite_lists.each do |invite_list|
+        invite_list.update_attribute(:mail, self.mail)
+      end
+    end
+  end
+
   # Removes references that are not handled by associations
   # Things that are not deleted are reassociated with the anonymous user
   def remove_references_before_destroy

app/views/account/about_us.html.erb

@@ -15,7 +15,7 @@
       研制团队认为MOORE的创新人才培养模式（如图1左图）是将互联网大规模协同机理与高校创新实践活动相结合的全新人才培养方法和模式，研制团队并基于本平台的架构形成了对MOORE核心机理的三方面认识（如图1右图）。
     </p>
     <div class="AgreementImg" >
-      <img src="images/aboutus_01.jpg" width="820" height="285" />
+      <img src="images/aboutus_01.jpg" width="619" height="215" />
       <p class="AgreementTxt T_C fb mt10">图1 基于MOORE的创新人才培养模式与核心机理</p>
     </div>
     <p class="AgreementTxt">
@@ -25,7 +25,7 @@
       特别是，根据师生的实际需要，Trustie平台提供了私有模式和公开模式，支持针对未公开成果实施有效知识产权保护为前提的交流分享（如图2）。随着越来越多的高校、课程和研究小组的加入，MOORE创新实践模式的生态效益将不断显现出来。
     </p>
     <div class="AgreementImg" >
-      <img src="images/aboutus_02.jpg" width="756" height="496" />
+      <img src="images/aboutus_02.jpg" width="616" height="405" />
       <p class="AgreementTxt T_C fb mt10">图2 基于MOORE的支撑平台和生态系统</p>
     </div>
     <p class="AgreementTxt">

app/views/account/login.html.erb

@@ -187,7 +187,7 @@
   <div class="loginContent">
     <div class="loginLeft">
       <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
-      <div class="loginInro">欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
+      <div class="loginInro">&nbsp;&nbsp;欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。<br/><br/>&nbsp;&nbsp;Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
     </div>
     <div class="loginRight">
       <div id="loginInBox">

app/views/admin/messages.html.erb

@@ -3,11 +3,17 @@
   <%=l(:label_system_message)%>
 </h3><br/>
 <div style="padding-top: 20px; padding-left: 5px;">
-  <%= form_for(@admin_messages, :html => {:id =>'system_message-form'}) do |f| %>
-      <div class="field">
-        <%= f.kindeditor :content,:width=>'87%',:editor_id=>'system_message_editor' %>
+  <%= form_for(@admin_messages, :html => {:id =>'system_messages-form'}) do |f| %>
+      <li>
+        <label><span class="">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
+        <input type="text" name="system_message[subject]" class="hwork_input_news" id="system_message_subject" width="576px" onblur="regexTitle($(this));" maxlength="255" placeholder="255个字符以内" value="">
+        <p id="title_notice_span" class="ml55"></p>
+      </li>
+      <li>
+        <label class="fl" >&nbsp;&nbsp;<span class="c_red"></span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+        <%= f.kindeditor :description,:width=>'87.5%',:editor_id=>'system_message_editor' %>
         <p id="content_notice_span" class="ml55"></p>
-      </div>
+      </li>
       <div>
         <p id="content_notice_span" class="ml55"></p>
       </div>
@@ -19,14 +25,8 @@
 <script>
     function system_message_length() {
         var obj = system_message_editor.html();
-        if (obj.length == 0) {
-            $("#content_notice_span").text("内容不能为空");
-            $("#content_notice_span").css('color', '#ff0000');
-            $("#content_notice_span").focus();
-            return false;
-        }
-        else if (obj.length > 255) {
-            $("#content_notice_span").text("内容过长，超过255个字符");
+        if (obj.length > 10000) {
+            $("#content_notice_span").text("内容过长，超过10000个字符");
             $("#content_notice_span").css('color', '#ff0000');
             $("#content_notice_span").focus();
             return false;
@@ -37,10 +37,27 @@
             return true;
         }
     }
+    function regexTitle(obj){
+        var title = obj.val();
+        if(title.length == 0)
+        {
+            $("#title_notice_span").text("标题不能为空").css("color", "#ff0000").focus();
+            return false;
+        }
+        else if(title.length > 255)
+        {
+            $("#title_notice_span").text("标题长度过长，不能超过255个字符").css("color", "#ff0000").focus();
+            return false;
+        }
+        else{
+            $("#title_notice_span").text("填写正确").css("color", "#008000");
+            return true;
+        }
+    }
     function submit_message() {
 
-        if (system_message_length()) {
-            $("#system_message-form").submit();
+        if (system_message_length() && regexTitle($("#system_message_subject"))) {
+            $("#system_messages-form").submit();
         }
     }
 </script>

app/views/boards/_course_show.html.erb

@@ -99,7 +99,7 @@
 //                }
               });
             </script>
-            <div  class="project_board_content break_word f14" id="content_<%=topic.id%>">
+            <div  class="project_board_content break_word f14 list_style" id="content_<%=topic.id%>">
               <div id="contentmessage<%=topic.id %>" class="upload_img">
                 <%= topic.content.html_safe %>
                 <!-- -->
@@ -165,7 +165,7 @@
                           <div class="Msg_txt">
                             <%= link_to User.current.member_of_course?(@board.course) ? "#{message.author.show_name}(#{message.author.login})" : "#{message.author}", user_path(message.author),:class => 'fl c_orange f14 ' %>
                             <br/>
-                            <div class="fl break_word f14">
+                            <div class="fl break_word f14 list_style">
                               <%= textAreailizable message,:content,:attachments => message.attachments %>
                               <!-- -->
                             </div>

app/views/boards/_project_show.html.erb

@@ -92,7 +92,7 @@
                 </script>
 
               <div class="cl"></div>
-              <div  class="project_board_content break_word f14" id="content_<%=topic.id%>">
+              <div  class="project_board_content break_word f14 list_style" id="content_<%=topic.id%>">
                 <div id="contentmessage<%=topic.id %>" class="upload_img">
                   <%= topic.content.html_safe %>
                   <!-- -->
@@ -150,7 +150,7 @@
                             <div class="Msg_txt">
                               <%= link_to_user_header message.author,false,:class => 'fl c_orange f14 ' %>
                               <br/>
-                              <div class="fl break_word f14">
+                              <div class="fl break_word f14 list_style">
                                 <%= textAreailizable message,:content,:attachments => message.attachments %>
                                 <!-- -->
                               </div>

app/views/comments/create.js.erb

@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data('<%= @user_activity_id%>');
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");

app/views/courses/_join_private_course.html.erb

@@ -57,6 +57,8 @@
                    :id => 'new-watcher-form') do %>
           <ul>
             <li>
+              <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+              <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
               <span class="tips">课&nbsp;程&nbsp;ID：</span>
               <input class=" width190" name="object_id" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>

app/views/courses/new.html.erb

@@ -5,6 +5,8 @@
   <ul>
     <%= labelled_form_for @course do |f| %>
       <li  class="ml45">
+        <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+        <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
         <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
         <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();">
         <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>

app/views/courses/settings.html.erb

@@ -20,6 +20,8 @@
             <div class="cl"></div>
           </li>
           <li  class="ml45">
+            <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+            <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
             <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();" value="<%= @course.name%>">
             <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>

app/views/courses/show.html.erb

@@ -7,7 +7,7 @@
       <a class="problem_pic fl">
         <%= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %>
       </a>
-      <div class="problem_txt fl mt5 upload_img">
+      <div class="problem_txt fl mt5 upload_img list_style">
         <%= link_to_user_header(activity.user,false,:class => 'problem_name c_orange fl') %>
         <span class="fl"> &nbsp;</span>
         <span class="fl"> <%= activity.course_act_type == "Course" ? "创建了课程" : l(:label_new_activity) %>：</span>

app/views/homework_common/_homework_detail_manual_form.html.erb

@@ -1,110 +0,0 @@
-<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="255" 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>
-    <div style="width: 83%;float: left;">
-      <% if edit_mode %>
-          <%= f.kindeditor :description,: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,:editor_id => 'homework_description_editor' %>
-      <% end %>
-    </div>
-  </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"}  %>
-        <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
-        <span class="fl mt5">&nbsp;分</span>
-        <div class="cl"></div>
-      </li>
-      <li style="display: none;">
-        <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;<%= homework.homework_detail_manual.absence_penalty%>&nbsp;</span>分</p>
-      <div class="cl"></div>
-    </li>
-  </ul> <!-- h1 end--->
-</div><!--hwork_new_set end-->

app/views/homework_common/_homework_detail_programing_form.html.erb

@@ -1,193 +0,0 @@
-<ul class="hwork_new_basic">
-  <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="255" 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>
-    <div style="width: 83%;float: left;">
-      <% if edit_mode %>
-          <%= f.kindeditor :description,: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,:editor_id => 'homework_description_editor' %>
-      <% end %>
-    </div>
-  </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>
-
-  <li>
-    <label class="label02">迟交扣分：&nbsp;</label>
-    <%#= select_tag :late_penalty,options_for_select(late_penalty_option,homework.late_penalty), {:class => "fl mb10 h26 w70"}  %>
-    <input type="number" value="<%= homework.late_penalty%>" min="0" max="50" class="fl mb10 h26 w70" name="late_penalty" onkeyup="check_late_penalty()">
-    <span class="fl mt5">&nbsp;分</span>
-    <div class="cl"></div>
-  </li>
-</ul><!--hwork_new_basic end--->
-
-<div class="cl"></div>
-<div class="hwork_new_set">
-  <p class="fl ml20 f14 mb10 c_orange">编程评测设置</p>
-  <div class="cl"></div>
-  <ul>
-    <li >
-      <label class="label02">&nbsp;开发语言：&nbsp;</label>
-      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language.to_i), {:class => "fl mb10 h26 w70",:onchange => "homework_language_change($(this));"}  %>
-      <div class="cl"></div>
-    </li>
-
-    <li >
-      <label class="label02">评分比例：&nbsp;</label>
-      <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.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_programing.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>
-
-    <li >
-      <label class="label02">&nbsp;标准代码：&nbsp;</label>
-      <textarea  name="standard_code"  class=" w547 h400 mb10 fl" oninput="init_programing_test();" onpropertychange="init_programing_test()"><%= homework.homework_detail_programing.standard_code || c_stantard_code_teacher%></textarea>
-      <div class="cl"></div>
-    </li>
-
-    <% if edit_mode %>
-        <% homework.homework_tests.each do |homework_test|%>
-            <div>
-              <li>
-                <label class="label02">&nbsp;测试输入：&nbsp;</label>
-                <input type="text" class="fl h26 w190 mb10" name="input[<%= homework_test.id%>]" value="<%= homework_test.input%>"/>
-              </li>
-              <li >
-                <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-                <input type="text" class="fl h26 w190  mb10" name="output[<%= homework_test.id%>]" value="<%= homework_test.output%>"/>
-              </li>
-              <li>
-                <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
-                <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-                <% if homework_test.result && !homework_test.result.to_s.empty?%>
-                    <% if homework_test.result == 0%>
-                        <a class="green_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">正确</a>
-                    <% else%>
-                        <a class="red_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">错误</a>
-                    <% end%>
-                <% else%>
-                    <a class="blue_btn fl ml5 mt1 programing_test" onclick="programing_test('<%= homework_test.id%>')" id="test_send_<%= homework_test.id%>">测试</a>
-                <% end%>
-                <input type="hidden"  id="test_result_<%= homework_test.id%>" name="result[<%= homework_test.id%>]"  value="<%= homework_test.result%>"/>
-              </li>
-              <div class="cl"></div>
-            </div>
-        <% end%>
-    <% else %>
-        <div>
-          <li>
-            <label class="label02">&nbsp;测试输入：&nbsp;</label>
-            <input type="text" class="fl h26 w190 mb10" name="input[0]" value="1 2"/>
-          </li>
-          <li >
-            <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
-            <input type="text" class="fl h26 w190  mb10" name="output[0]" value="3"/>
-          </li>
-          <li>
-            <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
-            <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
-            <a class="blue_btn fl ml5 mt programing_test" onclick="programing_test('0')" id="test_send_0">测试</a>
-            <input type="hidden"  id="test_result_0" name="result[0]"  />
-          </li>
-          <div class="cl"></div>
-        </div>
-    <% end %>
-    <input type="hidden" name="error_msg" id="homework_test_error_msg" value="<%= homework.homework_tests.first.error_msg if homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg%>">
-    <table class="border_ce" cellpadding="0" cellspacing="0" id="homework_work_test_show" style="display: <%= homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg && !homework.homework_tests.first.error_msg.empty? ? "block" : "none"%>">
-      <tbody>
-      <tr class="border_t" >
-        <td  class="td_end fb c_red w60 td_board_left">
-          错误信息:
-        </td>
-        <td  class="td_end wl" id="homework_work_test_desc">
-          <% if  homework.homework_tests.first && homework.homework_tests.first && homework.homework_tests.first.error_msg %>
-            <%= homework.homework_tests.first.error_msg%>
-          <% end%>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-  </ul>
-</div>
-
-<script type="text/javascript">
-
-    //点击测试，发送
-    function programing_test(obj) {
-        $.post(
-                '<%= programing_test_homework_common_index_path%>',
-                {
-                    src: $("textarea[name='standard_code']").val(),
-                    input: $("input[name='input[" + obj +"]']").val(),
-                    output: $("input[name='output[" + obj + "]']").val(),
-                    language: $("select[name='language']").val(),
-                    index: obj
-                },
-                function (data) {
-
-                }
-        );
-    }
-
-    function init_programing_test()
-    {
-        $(".programing_test").each(function(){
-            $(this).removeClass("green_btn red_btn").addClass("blue_btn").text("测试");
-            $(this).next("input").val("");
-        });
-    }
-
-    function homework_language_change(obj)
-    {
-        if(obj.val() == "1")
-        {
-//            alert(1);
-            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher%>");
-
-        }
-        else if(obj.val() == "2")
-        {
-//            alert(2);
-            $("textarea[name='standard_code']").val("<%= escape_javascript c_stantard_code_teacher_%>");
-
-        }
-    }
-</script>

app/views/homework_common/_new_homework_detail_manual_form.html.erb

@@ -1,74 +0,0 @@
-<div class="homepageRight">
-  <div class="HomeWork">
-    <div class="RightBanner">
-      <div class="NewsBannerName">发布作业</div>
-    </div>
-    <div class="HomeWorkCon">
-        <div class="mt15">
-            <textarea class="InputBox  W700 " placeholder="请输入作业标题" name="homework_common[name]" id="homework_name" maxlength="255" onkeyup="regex_homework_name();" value="<%= homework.name%>"></textarea>
-        </div>
-        <div class=" mt10">
-            <a href="javascript:void(0);" class="BlueCirBtn fl mr10">导入作业</a>
-            <input  type="text" name="homework_common[end_time]" id="homework_end_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.end_time%>" placeholder="截止日期"></input>
-                <div class="fl DateBorder mr10"><a href="javascript:void(0);" class="pic_date"></a></div>
-                <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" class="InputBox fl W120 date-input" readonly="readonly" value="<%= homework.publish_time%>" placeholder="发布日期"></input>
-                <div class="fl DateBorder"><a href="javascript:void(0);" class="pic_date"></a></div>
-            <div class="cl"></div>
-        </div>
-        <div class="mt10">
-        <% if edit_mode %>
-            <%= f.kindeditor :description,: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,:editor_id => 'homework_description_editor' %>
-        <% end %>
-        </div>
-        <div class="mt10">
-            <textarea class="InputBox  W700 SearchIcon" placeholder="发送到课程" style="margin-top: 0px; margin-bottom: 0px; height: 29px;"></textarea>
-        </div>
-        <div class="mt5">
-            <a href="javascript:void(0);" class="AnnexBtn fl mt3">上传附件</a>
-            <a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>
-            <div class="cl"></div>
-        </div>
-        
-        <div class="mt10">
-            <a href="javascript:void(0);" class=" fl DropBtn">高级功能</a>
-            <div class="DropLine"></div>
-            <div class="cl"></div>
-        </div>
-        <div class="advanced_option" style="display:none;">
-          <div class="mt10">
-              <select class="InputBox W120" required="true">
-                  <option value="语言选择">语言选择</option>
-                  <option value="C语言">C语言</option>
-                  <option value="C++">C++</option>
-                </select>
-          </div>
-          
-          <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-              <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-              <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-              <div class="cl"></div>
-          </div>
-        </div>
-        <div class="mt10">
-            <a href="javascript:void(0);" onClick="submit_homework('new_homework_common');" class="BlueCirBtnMini fr">发布</a>
-            <span class="fr mr10 mt3">或</span><%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'fr mr10 mt3'%>
-            <div class="cl"></div>
-        </div>
-    </div>
-  </div><!----HomeWork end-->
-  
-</div>
-
-<script id="t:test-answer-list" type="text/html">
-  <div class="mt10">
-      <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required></textarea>
-      <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
-      <a href="javascript:void(0);" class=" fl icon_remove" title="删除测试组"></a>
-      <div class="cl"></div>
-  </div>
-</script>
-

app/views/homework_common/_set_evalutation_att.html.erb

@@ -0,0 +1,53 @@
+<div class="markPopup" id="popbox02">
+  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id},:method => "post",:remote => true) do |f|%>
+      <span class="uploadText">匿评设置</span>
+      <div class="cl"></div>
+
+      <div class="mt15">
+        <span class="f14 fontGrey3 fl mt5">开启匿评</span>
+        <div class="calendar_div fl ml10">
+          <input  type="text" name="evaluation_start" id="evaluation_start_time" placeholder="开启匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_start%>"/>
+          <%= calendar_for('evaluation_start_time')%>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_evaluation_start_time" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
+
+      <div class="mt15">
+        <span class="f14 fontGrey3 fl mt5">关闭匿评</span>
+        <div class="calendar_div fl ml10">
+          <input  type="text" name="evaluation_end" id="evaluation_end_time" placeholder="关闭匿评日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= @homework_detail_manual.evaluation_end%>"/>
+          <%= calendar_for('evaluation_end_time')%>
+        </div>
+        <div class="cl"></div>
+        <p id="homework_evaluation_end_time" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
+
+      <div class="mt15 mb10">
+        <span class="f14 fontGrey3 mr10 fl mt5">匿评人数</span>
+        <input type="text" name="evaluation_num" id="evaluation_num" placeholder="默认匿评人数为3" maxlength="2" class="markInput fl" value="<%= @homework_detail_manual.evaluation_num%>"/>
+        <div class="cl"></div>
+        <p id="evaluation_num_notice" class="c_red"></p>
+      </div>
+      <div class="cl"></div>
+
+      <div class="mb20 none">
+        <span class="f14 fontGrey3 mr10">禁用匿评</span>
+        <input type="checkbox" />
+        <span class="f12 c_red ml10">禁用后将无法进行学生互评</span>
+      </div>
+      <div class="cl"></div>
+
+      <div>
+        <div class="courseSendSubmit">
+          <a href="javascript:void(0);" class="sendSourceText" onclick="submit_set_evaluation_attr('<%= @homework.end_time%>');">确定</a>
+        </div>
+        <div class="courseSendCancel">
+          <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
+        </div>
+      </div>
+      <div class="cl"></div>
+  <% end%>
+</div>

app/views/homework_common/alert_anonymous_comment.js.erb

@@ -3,5 +3,4 @@ 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");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed");

app/views/homework_common/edit.html.erb

@@ -16,6 +16,7 @@
 <!-- 老师身份才可以发布作业 -->
 <div class="HomeWork mb10">
   <%= form_for @homework do |f| %>
+      <input type="text" name="is_in_course" class="none" value="<%= @is_in_course%>"/>
       <div id="HomeWorkCon">
         <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
       </div>

app/views/homework_common/index.html.erb

@@ -25,9 +25,9 @@
           ( <%= 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") %>
+            <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework,:is_in_course => 1),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "fr mr10 work_edit")  %>
+            <%= link_to(l(:button_edit),edit_homework_common_path(homework,:is_in_course => 1), :class => "fr mr10 work_edit ml10") %>
+            <%= homework_anonymous_comment(homework)%>
         <% elsif @is_student%>
             <%= student_anonymous_comment homework %>
             <%= student_new_homework homework %>
@@ -37,7 +37,7 @@
             $(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">
+          <div id="bid_description_<%= homework.id%>_content" class="upload_img list_style">
             <%= homework.description.html_safe %>
           </div>
         </div>
@@ -78,11 +78,7 @@
             <div class="mt5">
               <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
               <div class="fl">
-                <% if homework.homework_detail_programing.language.to_i == 1%>
-                    C
-                <% elsif homework.homework_detail_programing.language.to_i == 2%>
-                    C++
-                <% end%>
+                <%= homework.language_name%>
               </div>
             </div>
             <div class="cl"></div>

app/views/homework_common/new.html.erb

@@ -1,17 +0,0 @@
-<%= 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_detail_manual_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 "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-  <% end%>
-</div><!--hwork_new end-->
-<div class="cl"></div>

app/views/homework_common/next_step.html.erb

@@ -1,30 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
-<%= error_messages_for 'homework_common' %>
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_course_homework_new)%>
-  </h2>
-</div>
-<% if @homework_type == "1"%>
-    <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_detail_manual_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 "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-    </div><!--hwork_new end-->
-<% elsif @homework_type == "2"%>
-    <div class="hwork_new">
-      <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-          <%= hidden_field_tag "course",@course.id%>
-          <%= hidden_field_tag "homework_common[homework_type]","2"%>
-          <%= render :partial => 'homework_common/homework_detail_programing_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 "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
-      <% end%>
-    </div><!--hwork_new end-->
-    <div class="cl"></div>
-<% end%>

app/views/homework_common/set_evaluation_attr.js.erb

@@ -0,0 +1 @@
+clickCanel();

app/views/homework_common/start_anonymous_comment.js.erb

@@ -1,6 +1,6 @@
 <% 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")%>');
+$("#<%= @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 => "postOptionLink")%>');
 <% elsif @statue == 2 %>
 alert('启动失败\n作业总数大于等于2份时才能启动匿评');
 <% elsif @statue == 3%>

app/views/homework_common/start_evaluation_set.js.erb

@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>');
+showModal('ajax-modal', '350px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+"<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");

app/views/homework_common/stop_anonymous_comment.js.erb

@@ -1,2 +1,2 @@
-$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('<span class="fr  pr_join_span mr10" title="匿评结束">匿评结束</span>');
+$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('');
 alert('关闭成功');

app/views/issues/add_journal.js.erb

@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_KindEditor_data(<%= @user_activity_id%>);
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");

app/views/issues/show.html.erb

@@ -30,7 +30,7 @@
     <!--talk_txt end-->
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
     <div class="cl"></div>
-    <div class="talk_info mb10" style="word-break:break-all;">
+    <div class="talk_info mb10 list_style" style="word-break:break-all;">
       <% if @issue.description? || @issue.attachments.any? -%>
           <% if @issue.description? %>
               <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
@@ -49,21 +49,26 @@
       <div class="pro_info_box mb10">
         <%= issue_fields_rows do |rows| %>
             <ul class="fl">
-                <li><p class="label03" >&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
+              <li><p class="label03">&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
+
+                <p class="pro_info_p"><%= @issue.status.name %></p>
               </li>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
-                <li><p class="label03" >&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
+                  <li><p class="label03">&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
                   </li>
               <% end %>
               <div class="cl"></div>
             </ul>
             <ul class="fl">
-                <li><p class="label03" >&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
+              <li><p class="label03">&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
+                <span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
               </li>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('done_ratio') %>
-                <li><p class="label03" >&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
+                  <li><p class="label03">&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
                   </li>
               <% end %>
               <div class="cl"></div>
@@ -71,24 +76,29 @@
 
             <ul class="fl ">
               <% unless @issue.disabled_core_fields.include?('start_date') %>
-                <li><p class="label03" style="width:50px;" >&nbsp;开始&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
+                  <li><p class="label03" style="width:50px;">&nbsp;开始&nbsp;&nbsp;:&nbsp;</p>
+
+                    <p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
                   </li>
               <% end %>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
-                <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
+                  <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
                   </li>
               <% end %>
               <div class="cl"></div>
             </ul>
             <ul class="fl ">
               <% unless @issue.disabled_core_fields.include?('due_date') %>
-                <li><p class="label03" >&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %></span>
+                  <li><p class="label03">&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date) ? format_date(@issue.due_date) : "--" %></span>
                   </li>
               <% end %>
               <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-                <li><p class="label03" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
+                  <li><p class="label03">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
+                    <span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
                   </li>
               <% end %>
               <div class="cl"></div>

app/views/journals/diff.html.erb

@@ -1,8 +1,8 @@
 <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
 <p>由<%= @journal.user %> 更新于 <%= format_time @journal.created_on %></p>
 
-<div class="text-diff">
-  <%= simple_format_without_paragraph @diff.to_html %>
+<div class="text-diff" style="word-break:break-all; word-wrap:break-word;">
+  <%= @diff.to_html.gsub("&lt;","<").gsub("&gt;",">").gsub("&quot;","\"").gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;quot;", "\"").html_safe %>
 </div>
 
 <p><%= link_to l(:button_back), issue_path(@issue), :onclick => 'history.back(); return false;' %></p>

app/views/layouts/base_courses.html.erb

@@ -33,36 +33,6 @@
 </div>
 <div class="cl"></div>
 <div id="Container">
-  <div id="TopBar">
-    <div class="topbar_info02 fl">
-      <h2>
-        <a href="http://<%= Setting.host_course%>" target="_blank" class="c_blue">
-          <%= l(:label_courses_community)%>
-        </a>
-      </h2>
-      <p class="hiddent">
-        <%= l(:label_user_location) %> :
-        <%= link_to l(:field_homepage), home_path %>
-        >
-        <a href="http://<%= Setting.host_course%>">
-          <%=l(:label_courses_management_platform)%>
-        </a>
-        >
-        <%= link_to @course.name, course_path(@course) %>
-      </p>
-    </div>
-    <!--<div class="search fl">-->
-      <!--<%#= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %>-->
-          <!--<input class="search_text fl" id="name" name="name" onkeyup="regexName('搜索条件不能为空');" placeholder="课程名称" type="text">-->
-          <!--<a href="javascript:void(0)" onclick="submitSerch('<%#= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >-->
-            <!--<%#= l(:label_search)%>-->
-          <!--</a>-->
-          <!--<div class="cl"></div>-->
-          <!--<span id="project_name_span" style="float: left"></span>-->
-      <!--<%# end %>-->
-    <!--</div>-->
-  </div><!--TopBar end-->
-  <div class="cl"></div>
   <div id="content">
     <div id="LSide" class="fl">
       <div class="project_info">
@@ -175,12 +145,12 @@
     </div><!--LSide end-->
 
     <div id="RSide" class="fl">
-      <%= render_flash_messages %>
       <%= yield %>
-      <%= call_hook :view_layouts_base_content %>
+      <%#= render_flash_messages %>
+      <%#= call_hook :view_layouts_base_content %>
     </div>
 
-    <div style="clear:both;"></div>
+    <div class="cl"></div>
 
   </div><!--Content end-->
 </div><!--Container end-->

app/views/layouts/base_projects.html.erb

@@ -36,21 +36,6 @@
   <%#= render :partial => 'layouts/new_header'%>
   <div class="cl"></div>
 
-  <!--TopBar begin-->
-  <div id="TopBar">
-    <div class="topbar_info02 fl">
-      <h2>
-        <a href="http://<%= Setting.host_name %>" target="_blank" class="c_blue">
-          <%= l(:label_projects_community) %>
-        </a>
-      </h2>
-      <p class="hidden">
-        <%= l(:label_user_location) %> :
-        <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
-      </p>
-    </div>
-  </div><!--TopBar end-->
-
   <div id="content">
     <div id="LSide" class="fl">
       <div class="project_info">
@@ -113,9 +98,9 @@
           </div>
           <ul class="navContent " style="display:block" id="navContent_invit">
             <li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
-            <% if User.current.allowed_to?(:manage_members, @project) %>
-              <li><%=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>
-            <% end %>
+            <!--<%# if User.current.allowed_to?(:manage_members, @project) %>-->
+              <!--<li><%#=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>-->
+            <!--<%# end %>-->
           </ul>
         <% end %><!--end-->
         <!--menu 左侧工具栏 -->

app/views/layouts/base_users_new.html.erb

@@ -331,8 +331,8 @@
         <span>48px*48px</span> <br />
       </div>
       <div class="cl mb10"></div>
-      <a href="javascript:hideModal();" class=" fr grey_btn mr15"> 取&nbsp;&nbsp;消</a>
-      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10">确&nbsp;&nbsp;定</a>
+      <a href="javascript:hideModal();" class=" fr grey_btn mr15 f14"> 取&nbsp;&nbsp;消</a>
+      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10 f14">确&nbsp;&nbsp;定</a>
 
     </div><!--talknew end-->
     <div class="cl"></div>

app/views/layouts/new_base_user.html.erb

@@ -103,15 +103,15 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-                  <%=link_to "", new_course_path, :class => "homepageMenuSetting fr", :title => "新建课程"%>
+                  <%=link_to "", new_course_path(:host=> Setting.host_course), :class => "homepageMenuSetting fr", :title => "新建课程"%>
               <% else%>
                   <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:remote => true, :title => "加入课程"%>
               <% end%>
           <% end%>
         </div>
-        <div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses">
-          <ul>
         <% courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
+        <div class="homepageLeftMenuCourses <%= courses.empty? ? 'none' : ''%>" id="homepageLeftMenuCourses">
+          <ul>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
           </ul>
         </div>
@@ -119,18 +119,18 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuForge').slideToggle();">项目</a>
 
           <% if is_current_user%>
-              <%=link_to "", new_project_path, :class => "homepageMenuSetting fr", :title => "新建项目"%>
+              <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :title => "新建项目"%>
           <% end%>
         </div>
-        <div class="homepageLeftMenuCourses" id="homepageLeftMenuForge">
-          <ul>
         <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
+        <div class="homepageLeftMenuCourses <%= projects.empty? ? 'none' : ''%>" id="homepageLeftMenuForge">
+          <ul>
             <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
           <!--<a href="javascript:void(0);" class="homepageMenuText">留言</a>-->
-          <%= link_to '留言',feedback_path(@user),:class=>'homepageMenuText'%>
+          <%= link_to '留言',feedback_path(@user, :host=> Setting.host_user),:class=>'homepageMenuText'%>
         </div>
       </div>
       <div class="homepageLeftLabelContainer">
@@ -195,8 +195,8 @@
         <span>48px*48px</span> <br />
       </div>
       <div class="cl mb10"></div>
-      <a href="javascript:hideModal();" class=" fr grey_btn mr15"> 取&nbsp;&nbsp;消</a>
-      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10">确&nbsp;&nbsp;定</a>
+      <a href="javascript:hideModal();" class=" fr grey_btn mr15 f14"> 取&nbsp;&nbsp;消</a>
+      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10 f14">确&nbsp;&nbsp;定</a>
     </div><!--talknew end-->
     <div class="cl"></div>
   </div><!--floatbox end-->

app/views/mailer/homework_endtime__added.html.erb

@@ -0,0 +1,11 @@
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @homework_endtime_name, @homework_endtime_url%> <span style="color: red">截止时间快到了！</span></p>
+          <p style="color: red;font-size: 12px;">如果您还未交作业，请赶紧提交作业！</p>
+        </span>
+    </li>
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>

app/views/mailer/request_member_to_project.html.erb

@@ -4,9 +4,9 @@
 
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-        	<p><span style="color:#1b55a7; font-weight:bold;"><%= @invitor_name %></span> 邀请您加入项目：<span style="color:#1b55a7; font-weight:bold;"><%= @project_name %></span> </p>
+        	<p><span style="color:#1b55a7; font-weight:bold;"><%= @invitor_name %></span> 邀请您加入项目：<span style="color:#1b55a7; font-weight:bold;"><%=link_to @project_name, project_url(@project) %></span> </p>
           <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
-          <p>点击“同意加入”按钮，即可快速加入项目！</p> <br/>
+          <p>点击“同意加入”按钮，即可快速加入项目，查看项目相关信息！</p> <br/>
           <label  class="mail_reply">
             <%= link_to( l(:label_agree_join_project), @project_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
           </label>

app/views/mailer/send_invite_in_project.html.erb

@@ -1,7 +1,5 @@
-
 <div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
   <ul style="list-style-type:none; margin:0; padding:0;">
-
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
           <p><%= @subject %> </p>
@@ -9,13 +7,9 @@
           <p> <%= link_to @project_url, @project_url%></p>
           <p>您的账号为:<%= @email %></p>
           <p>密码为： <%= @password %></p>
-
+          <p style="color: red;font-size: 12px;">为了您的账号安全，请勿将邮件信息告知他人！</p>
         </span>
     </li>
-
   </ul>
-
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
 </div>
-
-

app/views/mailer/send_mail_anonymous_comment_close.html.erb

@@ -0,0 +1,10 @@
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @anonymous_comment_close_name, @anonymous_comment_close_url%> <span style="color: red; padding-left: 10px;">已经关闭了匿评！</span></p>
+        </span>
+    </li>
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>

app/views/mailer/send_mail_anonymous_comment_open.html.erb

@@ -0,0 +1,10 @@
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+          <p><%=link_to @author, user_url(@author) %> 发布的作业：<%=link_to @anonymous_comment_close_name, @anonymous_comment_close_url%> <span style="color: red; padding-left: 10px;">已经开启匿评了！</span></p>
+        </span>
+    </li>
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>

app/views/messages/reply.js.erb

@@ -1,6 +1,6 @@
 <%if @project%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 <%elsif @course%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 <%end%>
-init_KindEditor_data(<%= @user_activity_id%>);
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");

app/views/news/_course_news_list.html.erb

@@ -7,7 +7,7 @@
     <% newss.each do |news| %>
         <div class="problem_main upload_img">
           <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
-          <div class="problem_txt fl mt5">
+          <div class="problem_txt fl mt5 list_style">
             <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
             <span class="fl">
                 <%= l(:label_release_news) %>：

app/views/news/_course_show.html.erb

@@ -4,7 +4,7 @@
 </div>
 <div class="problem_main">
   <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-  <div class="problem_txt fl mt5">
+  <div class="problem_txt fl mt5 list_style">
     <h4 class="r_txt_tit mb5">
       <%=h @news.title %>
     </h4>
@@ -32,6 +32,7 @@
             <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
             <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
           </div>
+          <p id="add_reply_news"></p>
          <p class="mt10">
             <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="KindEditor.instances[0].html('');">
               <%= l(:label_cancel_with_space) %>
@@ -48,9 +49,9 @@
   <% comments.each do |comment| %>
       <% next if comment.new_record? %>
       <div class="ping_C mb10">
-        <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author)%></div>
+        <div><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author), :class => "problem_pic fl"%></div>
         <div class="ping_discon">
-          <div class="ping_distop upload_img break_word">
+          <div class="ping_distop upload_img break_word list_style">
             <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %>
             <span class="c_grey fr">
                 <%= format_time(comment.created_on) %>

app/views/news/_project_news.html.erb

@@ -1,3 +1,9 @@
+<style type="text/css">
+  span{
+      word-break:break-all;
+      word-wrap:break-word;
+  }
+</style>
 <%
    btn_tips = l(:label_news_new)
    label_tips = l(:label_news)
@@ -25,7 +31,7 @@
       <% @newss.each do |news| %>
           <div class="problem_main">
             <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
-            <div class="problem_txt fl mt5">
+            <div class="problem_txt fl mt5 list_style">
               <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
               <span class="fl"> <%= l(:label_add_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
               <%=link_to "<span class = 'pic_mes'>#{news.comments.all.count}</span>".html_safe, news_path(news.id), :class => "pro_mes_w_news" %><br />

app/views/news/_project_show.html.erb

@@ -14,7 +14,7 @@
 
 <div class="problem_main">
       <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-      <div class="problem_txt fl mt5">
+      <div class="problem_txt fl mt5 list_style">
         <h4 class="r_txt_tit mb5">  <%=h @news.title %></h4>
         <%#= watcher_link(@news, User.current) %>
         <%= link_to(l(:button_edit),

app/views/poll/_edit_head.html.erb

@@ -22,3 +22,21 @@
       <div class="cl"></div>
     </div><!--编辑头部 end-->
 <% end%>
+<script type="text/javascript">
+  $(function(){
+      if($('#polls_description_div').html().trim() == '') {
+          $('#polls_description_div').html("<p style='color:#999999'>问卷描述</p>");
+      }
+  });
+
+  $('#polls_description_div').focus(function(){
+      //alert($('#polls_description_div').html().trim());
+      if(/^\s*<\w*\s*\w*\=\"\w*\:\s*\#\d*\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test($('#polls_description_div').html().trim())) {
+          $('#polls_description_div').html('');
+      }
+  }).blur(function(){
+      if($('#polls_description_div').html().trim() == '') {
+          $('#polls_description_div').html("<p style='color:#999999'>问卷描述</p>");
+      }
+  });
+</script>

app/views/poll/_poll.html.erb

@@ -30,13 +30,13 @@
   <% if poll.polls_status == 1 %>
       <li><%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml5"%></li>
   <% else%>
-      <li class="polls_de_grey fr ml5">编辑</li>
+      <li class="polls_de_grey fr ml5" title="未发布的问卷才能进行编辑">编辑</li>
   <% end%>
 
   <% if poll.polls_status == 2 %>
       <li><a class="polls_de fr ml5" onclick="close_poll(<%= poll.id%>);" href="javascript:">关闭</a></li>
   <% else %>
-      <li class="polls_de_grey fr ml5">关闭</li>
+      <li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>
   <% end%>
 
     <% if poll.polls_status == 1%>

app/views/projects/create.js.erb

@@ -0,0 +1,3 @@
+$("#project_id").replaceWith("<%= escape_javascript(select_tag :project_id, options_for_select(user_projects_option), {:class => "InputBox  W680 fl"})%>");
+hideModal("#popbox02");
+alert("创建成功");

app/views/projects/invite_members_by_mail.html.erb

@@ -31,9 +31,9 @@
             $("#valid_email").text("<%= l(:label_email_format_error)%>");
             return false;
         }
-        else if(email.split('@')[0].length >= 20)
+        else if(email.length > 25)
         {
-            $("#valid_email").text("邮箱名过长,最长为20个字符");
+            $("#valid_email").text("邮箱名过长,最长为25个字符");
             return false;
         }
         else
@@ -85,7 +85,39 @@
         <%= l(:label_send_email)%>
       </a>
   <% end %>
+
   <%# 邀请用户的状态 %>
+  <% unless @inviter_lists.blank? %>
+  <div class="section">
+    <div class="section-header">
+        <div class="desc">项目成员邀请状态列表</div>
+    </div>
+    <div class="invitations-records">
+      <% @inviter_lists.each do |inviter_list| %>
+          <table>
+            <tbody>
+            <% if inviter_list.user != nil %>
+            <tr>
+              <td class="email"><%= inviter_list.user.mail %></td>
+              <td class="text-name">
+                <% if inviter_list.user.active? %>
+                    <%=link_to inviter_list.user.name, user_path(inviter_list.user), :class => "c_eblue" %>
+                <% else %>
+                    <span class="unactive"><%= inviter_list.user.name %></span>
+                <% end %>
+              </td>
+              <td class="text-status"><%= status_for_ivitied(inviter_list, @project) %></td>
+              <!--<td class="text-time"><%#= time_tag(inviter_list.created_at).html_safe %></td>-->
+            </tr>
+            <% end %>
+            </tbody>
+          </table>
+      <% end %>
+    </div>
+  </div>
+  <% end %>
+
+
   <% unless @inviter_lists.blank? %>
     <div>
       <% unless @inviters_count.nil? %>

app/views/projects/settings/_new_repositories.html.erb

@@ -59,7 +59,7 @@
 </a>
 <div class="cl"></div>
 
-<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} do |f| %>
+<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
 <div id="pro_st_edit_ku" class="pro_st_edit_ku">
   <ul>
     <li >
@@ -79,6 +79,8 @@
         </li>
     <% end %>
     <li >
+      <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+      <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
       <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
       <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
       <% unless @repository.identifier_frozen? %>

app/views/projects/show.html.erb

@@ -24,7 +24,7 @@
         <% if e.forge_act_type == "Issue" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(act.author), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
+              <div class="problem_txt fl mt5 break_word list_style">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to act.author, user_path(act.author), :class => "problem_name c_orange fl" %><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -60,7 +60,7 @@
             <% elsif e.forge_act_type == "Message" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
+              <div class="problem_txt fl mt5 break_word list_style">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>
@@ -79,7 +79,7 @@
         <% elsif e.forge_act_type == "News" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>
-              <div class="problem_txt fl mt5 break_word">
+              <div class="problem_txt fl mt5 break_word list_style">
                 <a class="problem_name fl ">
                   <%= h(e.project) if @project.nil? || @project.id != e.project_id %>
                   <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%= l(:label_new_activity) %> ：</span>

app/views/student_work/_add_score_reply.html.erb

@@ -1,4 +1,5 @@
 <%= 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 %>
+    <input type="hidden" value="<%= is_last%>" name="is_last">
     <a href="javascript:void(0);" class="fr blue_n_btn" onclick="$('#add_score_reply_<%= score.id%>').find('form').submit();">回复</a>
 <% end%>

app/views/student_work/_evaluation_student_work_title.html.erb

@@ -1,47 +0,0 @@
-<li class="hwork_num ">
-  <span class="c_dark f14 fb fl">学号</span>
-</li>
-<li class=" hwork_name f14 fb c_dark">
-  <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "name"%>
-      <%= link_to "",student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>
-<li class="hwork_tit">
-  <span class="c_dark f14 fb fl">作品名称</span>
-</li>
-<li class=" hwork_time f14 fb c_dark">
-  <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "created_at"%>
-      <%= link_to "",student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>
-<li class="mr5 w40 ml15">
-  <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "teacher_score"%>
-      <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>
-<li class="mr5 w40 ml20">
-  <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "teaching_asistant_score"%>
-      <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-
-  <% end%>
-</li>
-<li class="ml15 w40">
-  <% if @homework.homework_type == 1%>
-      <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% elsif @homework.homework_type == 2%>
-      <%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% end %>
-  <% if @show_all && @order == "student_score"%>
-      <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>
-<li class="ml20">
-  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "score"%>
-      <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>

app/views/student_work/_evaluation_title.html.erb

@@ -0,0 +1,15 @@
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 width505">
+    <span class="HomeworkNameTitle f14 fb fl">作品名称</span>
+    <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+    <span class="HomeworkStuTitle f14 fb fl">学号</span>
+  </li>
+
+  <li class="hworkList130 hworkH30 fb ml10">
+    时间
+  </li>
+
+  <li class="hworkList50 hworkH30 fb mr10 ml10">
+    我的评分
+  </li>
+</ul>

app/views/student_work/_evaluation_un_title.html.erb

@@ -0,0 +1,51 @@
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
+    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr60 ml80' : 'mr95 ml100'%>">作品名称</span>
+    <span class="c_dark f14 fb fl mr50">姓名</span>
+    <span class="c_dark f14 fb fl">学号</span>
+  </li>
+
+  <li class="hworkList130 hworkH30">
+    <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
+    <% if @show_all && @order == "created_at"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <% end%>
+  </li>
+
+  <li class="hworkList50 hworkH30" >
+    <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%>
+    <% if @show_all && @order == "teacher_score"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
+    <% end%>
+  </li>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+    <% if @show_all && @order == "teaching_asistant_score"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <% end%>
+  </li>
+
+  <% if @homework.homework_type == 2%>
+      <li class="hworkList50 hworkH30">
+        <%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+        <% if @show_all && @order == "system_score"%>
+            <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+        <% end%>
+      </li>
+  <% end%>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+    <% if @show_all && @order == "student_score"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <% end%>
+  </li>
+
+  <li class="hworkList50 hworkH30">
+    <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
+    <% if @show_all && @order == "score"%>
+        <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
+    <% end%>
+  </li>
+</ul>

app/views/student_work/_evaluation_un_work.html.erb

@@ -0,0 +1,81 @@
+<!-- 匿评作品列表，显示某一个作品的信息 -->
+<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
+  <li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
+    <ul>
+      <li class="hworkPortrait mt15 mr10">
+        <%= link_to(image_tag(url_to_avatar(User.current),:width =>"40",:height => "40"),user_activities_path(User.current.id))%>
+      </li>
+      <div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+        <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">
+          <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+          <div>
+            <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
+          </div>
+        </li>
+        <li>
+          <ul class="mt10 fl">
+            <li class="hworkStName mr10 mt16" title="姓名">
+              <%= student_work.user.show_name%>
+            </li>
+            <li class="hworkStID mt16" title="学号">
+              <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+            </li>
+          </ul>
+        </li>
+      </div>
+    </ul>
+  </li>
+  <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
+    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+        <span class="c_red">[迟交]</span>
+    <% end %>
+  </li>
+  <li class="hworkList50 <%= score_color student_work.teacher_score%>">
+    <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
+  </li>
+  <li class="hworkList50 <%= score_color student_work.teaching_asistant_score%>">
+    <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
+  </li>
+
+  <% if @homework.homework_type == 2%>
+      <!-- 系统评分 -->
+      <li class="hworkList50 <%= score_color student_work.system_score%>">
+        <%= student_work.system_score.nil? ? "--" : format("%.1f",student_work.system_score)%>
+      </li>
+  <% end%>
+
+  <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
+    <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
+    <% unless student_work.student_score.nil?%>
+        <span class="linkBlue">
+          (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
+        </span>
+        <div class="infoNi none">
+          现共有
+          <span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>&nbsp;</span>
+          名学生进行了匿评，平均分为
+          <span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
+        </div>
+    <% end%>
+  </li>
+
+  <!-- 成绩 -->
+  <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
+  <li class="hworkList50 <%= score_color score%> student_final_scor_info">
+    <%= score.nil? ? "--" : format("%.1f",score)%>
+    <% unless score.nil?%>
+        <div class="infoNi none width180">
+          作品最终评分为
+          <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
+          迟交扣分
+          <span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分，
+          缺评扣分
+          <span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
+          最终成绩为
+          <span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
+        </div>
+    <% end%>
+  </li>
+</ul>
+

app/views/student_work/_evaluation_work.html.erb

@@ -1,29 +1,62 @@
 <!-- 匿评作品列表，显示某一个作品的信息 -->
-<ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
+<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
   <% is_my_work = student_work.user == User.current%>
-  <li class="hwork_num">
+  <li class="hworkList340 width525">
+    <ul>
       <% if is_my_work%>
-     <span>
+          <li class="hworkPortrait mt15 mr10">
+            <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
+          </li>
+          <li class="hworkName mt15 mr15 width285">
+            <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+            <div>
+              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+            </div>
+          </li>
+          <li>
+            <ul class="mt10 fl">
+              <li class="hworkStName mr10 mt16" title="姓名">
+                <%= student_work.user.show_name%>
+              </li>
+              <li class="hworkStID mt16" title="学号">
                 <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-     </span>
-    <% else%>
-        <span class="ml30">--</span>
-    <% end%>
               </li>
-  <li class="hwork_name">
-    <% if is_my_work%>
-        <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02" %>
+            </ul>
+          </li>
       <% else%>
-        <%= link_to "匿名","javascript:void(0)", :class => "c_blue02"%>
+          <li class="hworkPortrait mt15 mr10">
+            <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
+          </li>
+          <li class="hworkName mt15 mr15 width285">
+            <div>
+              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+            </div>
+          </li>
+          <li>
+            <ul class="mt10 fl">
+              <li class="hworkStName mr10 mt16" title="姓名">
+                匿名
+              </li>
+              <li class="hworkStID mt16" title="学号">
+                --
+              </li>
+            </ul>
+          </li>
       <% end%>
+
+    </ul>
   </li>
-  <li class=" hwork_tit_e" style="width: 410px">
-    <% student_work_name = student_work.name.nil? || student_work.name.empty? ? '匿名的作品' : student_work.name%>
-    <%= link_to student_work_name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
+  <li class="hworkList130 c_grey">
+    <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+        <span class="c_red">[迟交]</span>
+    <% end %>
   </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 class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
+    <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </li>
-  <div class="cl"></div>
-</ul><!---hwork_ul end-->
+</ul>
+

app/views/student_work/_evaluation_work_title.html.erb

@@ -1,12 +0,0 @@
-<li class="hwork_num ">
-  <span class="f14 f_b c_dark fl ">学号</span>
-</li>
-<li class="hwork_name f14 fb c_dark">
-  <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>

app/views/student_work/_jour_replay.html.erb

@@ -6,9 +6,9 @@
     </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")  %>
+                    :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete), :class => "fr linkBlue mr5")  %>
     <% end %>
-    <span class=" fr c_grey mr10">
+    <span class=" fr c_grey mr20">
         <%=format_time jour.created_on %>
       </span>
     <div class="cl mb5"></div>

app/views/student_work/_new_project.html.erb

@@ -0,0 +1,31 @@
+<div class="BluePopupBox" id="popbox02">
+  <%= labelled_form_for(Project.new,:remote => "true") do |f| %>
+      <h2 class="BluePopuph2 fl">新建项目</h2>
+      <div class="cl"></div>
+      <div class="">
+        <div class="mt10 mb10">
+          <input type="text" class="none" />
+          <input class="InputBox W700" placeholder="项目名称" name="project[name]" id="project_name" onkeyup="regex_project_name();" />
+          <p id="project_name_error_msg" class="c_red"></p>
+        </div>
+        <div class="mb10">
+          <textarea class="InputBox W700" placeholder="项目描述" id="project_description" name="project[description]" onkeyup="regex_project_desc();"></textarea>
+          <p id="project_desc_error_msg" class="c_red"></p>
+          <script>
+              var text = document.getElementById("project_description");
+              autoTextarea(text);// 调用
+          </script>
+        </div>
+
+        <div class="fl">
+          <input type="checkbox" name="project[is_public]" class="mt5" checked value="1" /><label class=" ml5 ">公开</label>
+        </div>
+
+        <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_project();">确定</a>
+        <span class="fr mr10 mt3">或</span>
+        <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="clickCanel();">取消</a>
+        <div class="cl"></div>
+      </div>
+  <% end%>
+  <div class="cl"></div>
+</div><!----BluePopupBox end-->

app/views/student_work/_programing_work_show.html.erb

@@ -1,42 +1,56 @@
 <div class="show_hwork_arrow"></div>
-<div class="show_hwork">
+<div class="showHwork">
   <ul>
     <li class="fl" >
-      <span class="tit_fb">
-        上交时间：
-      </span>
+      <span class="tit_fb">上交时间：</span>
       <%=format_time @work.created_at %>
     </li>
-    <% if  @work.user != User.current%>
-        <!-- 不是自己显示为点赞，编程作业不可编辑和删除 -->
+
+    <% if @work.user == User.current && @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 "",new_student_work_path(:homework => @homework.id),:class => "pic_edit"%>
+        </li>
+    <% end%>
+    <% if @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>
-      <div class="show_hwork_p break_word">
-        <%= text_format @work.description%>
+      <span class="tit_fb ">编程代码：</span>
+      <div class="showHworkP break_word">
+        <%= text_format(@work.description) if @work.description%>
       </div>
       <div class="cl"></div>
     </li>
 
     <% if @is_teacher%>
-        <li>
+        <li class="mt10 fl">
           <span class="tit_fb ">
             测试结果：
           </span>
           <div class="show_hwork_p break_word">
             <% @work.student_work_tests.each_with_index do |test, index| %>
                 <div class="ProResultTop">
-                  <p class="c_blue fl">第<%= @work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
+                  <p class="c_blue fl">
+                    第<%= @work.student_work_tests.count - index%>次测试
+                  </p>
+                  <span class="fr c_grey">
+                    <%= test.created_at.to_s(:db) %>
+                  </span>
                   <div class="cl"></div>
                 </div>
                 <% if test.status.to_i == -2 %>
-                    <div class="ProResultCon "><%= test.results.first %></div>
+                    <div class="ProResultCon ">
+                      <%= test.results.first %>
+                    </div>
                 <% else %>
                     <div class="ProResultTable " >
                       <ul class="ProResultUl " >
@@ -46,9 +60,9 @@
                               <% if x["status"].to_i != 0 %>
                                   <span class="w150 c_red">测试错误！</span>
                                   <span class="w60">您的输出：</span>
-                                  <span class="W200"><%=x["result"]%></span>
+                                  <span class="width150"><%=x["result"]%></span>
                                   <span class="w60">正确输出：</span>
-                                  <span  class="W200"><%=x["output"]%></span>
+                                  <span  class="width150"><%=x["output"]%></span>
                                   <div class="cl"></div>
                               <% else %>
                                   <span class="w150 c_green">测试正确！</span>
@@ -62,21 +76,27 @@
             <% end %>
           </div>
         </li>
+    <% end%>
 
-        <!-- 编程作业老师才可以评分 -->
+    <li >
+      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+          <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
           <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
             <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
           </div>
       <% end%>
+      <div class="cl"></div>
+    </li>
   </ul>
 
-  <div class="ping_box mt10" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-    <%@work.student_works_scores.order("updated_at desc").each do |score|%>
+  <div class="ping_box fl" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+    <%@student_work_scores.each do |score|%>
         <div id="work_score_<%= score.id%>">
-          <%= render :partial => 'student_work_score',:locals => {:score => score}%>
+          <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%>
         </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>
+  <!---ping_box end--->
+  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
   <div class="cl"></div>
-</div><!---show_hwork end--->
+</div>

app/views/student_work/_set_score_rule.html.erb

@@ -0,0 +1,63 @@
+<%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id},:method => "post") do |f|%>
+    <div class="markPopup" id="popbox02">
+      <span class="uploadText">评分设置</span>
+      <div class="mt15">
+        <span class="f14 fontGrey3 mr10">迟交扣分</span>
+        <input type="text" name="late_penalty" id="late_penalty_num" placeholder="请输入0-50数值" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+      </div>
+      <div>
+        <span class="f14 fontGrey3 mr10">缺评扣分</span>
+        <input type="text" name="absence_penalty" id="absence_penalty_num" placeholder="请输入0-50数值" class="markInput" value="<%= homework.homework_detail_manual.absence_penalty%>" onkeyup="check_late_penalty('absence_penalty_num')"/>
+      </div>
+
+      <% if homework.homework_type == 2%>
+          <div>
+            <span class="f14 fontGrey3 mr10">系统评分</span>
+            <%= select_tag :sy_proportion,options_for_select(ta_proportion_option,homework.homework_detail_programing.ta_proportion), {:class => "markPercentage"}  %>
+          </div>
+
+          <script>
+              $("#sy_proportion").change(function(){
+                  var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100);
+                  $("#ta_proportion").replaceWith(build_selector(ta_proportion));
+                  $("#student_proportion").val("0%");
+              });
+
+              $("#ta_proportion").live("change",function(){
+                  var ta_proportion = 100 - parseInt($("#sy_proportion").val() * 100) - parseInt($("#ta_proportion").val() * 100);
+                  $("#student_proportion").val(ta_proportion  + "%");
+              });
+          </script>
+      <% else%>
+          <script>
+              $("#ta_proportion").change(function(){
+                  var ta_proportion = $("#ta_proportion").val();
+                  $("#student_proportion").val((100 - parseInt(ta_proportion * 100)) + "%");
+              });
+          </script>
+      <% end%>
+
+      <div>
+        <span class="f14 fontGrey3 mr10">教辅评分</span>
+        <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i),homework.homework_detail_manual.ta_proportion), {:class => "markPercentage"}  %>
+      </div>
+      <div>
+        <span class="f14 fontGrey3 mr10">学生匿评</span>
+        <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i%>%" class="markPercentage" readonly>
+      </div>
+      <div class="mb20">
+        <span class="f14 fontGrey3 mr10">教师优先</span>
+        <input type="checkbox" name="teacher_priority" <%= homework.teacher_priority == 1 ? 'checked' : ''%>/>
+        <span class="f12 c_red ml10">教师评分为最终评分</span>
+      </div>
+      <div>
+        <div class="courseSendSubmit">
+          <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();">确定</a>
+        </div>
+        <div class="courseSendCancel">
+          <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>
+        </div>
+      </div>
+      <div class="cl"></div>
+    </div>
+<% end%>

app/views/student_work/_show.html.erb

@@ -1,13 +1,13 @@
 <div class="show_hwork_arrow"></div>
-<div class="show_hwork">
+<div class="showHwork">
   <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) %>
-      <!-- 我的作业 && (非匿评作业 || 为开启匿评)，显示编辑和删除按钮 -->
+    <% if @work.user == User.current && @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>
@@ -15,27 +15,26 @@
           <%= 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%>
-      <!-- 普通作业或者编程作业，或者是匿评结束阶段，显示点赞按钮 -->
+    <% if @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>-->
+    <!--<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" )%>
+          <%= link_to( @work.project.name, project_path(@work.project.id), :class => "linkBlue" )%>
         </li>
     <% end%>
+
     <li >
       <span class="tit_fb ">内容：</span>
-    <div class="show_hwork_p break_word">
+      <div class="showHworkP break_word">
         <%= text_format(@work.description) if @work.description%>
       </div>
       <div class="cl"></div>
@@ -45,28 +44,31 @@
       <% if @work.attachments.empty?%>
           <span style="color: #999999">尚未提交附件</span>
       <% else%>
-        <div class="fl">
+          <div class="fl" style="width: 90%;">
             <%= 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 )%>
-      <!-- 老师 || 匿评作业 && 开启匿评状态 && 不是当前用户自己的作品 -->
+    </li>
+    <li >
+      <% if @is_teacher || (@homework.homework_detail_manual.comment_status == 2 && @work.user != User.current )%>
+          <!-- 老师 || 开启匿评状态 && 不是当前用户自己的作品 -->
           <div id="add_student_score_<%= @work.id%>" class="mt10 evaluation">
             <%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
           </div>
       <% end%>
+      <div class="cl"></div>
+    </li>
   </ul>
 
-<div class="ping_box mt10" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
-  <%@work.student_works_scores.order("updated_at desc").each do |score|%>
+  <div class="ping_box fl" id="score_list_<%= @work.id%>" style="<%= @work.student_works_scores.empty? ? 'padding:0px;' : ''%>">
+    <%@student_work_scores.each do |score|%>
         <div id="work_score_<%= score.id%>">
-        <%= render :partial => 'student_work_score',:locals => {:score => score}%>
+          <%= render :partial => 'student_work_score',:locals => {:score => score,:is_last => score == @student_work_scores.last}%>
         </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>
+  <!---ping_box end--->
+  <a href="javascript:void(0);" class="fr linkBlue mt5 mb5" onclick="$('#about_hwork_<%= @work.id%>').html('');">收起</a>
   <div class="cl"></div>
-</div><!---show_hwork end--->
+</div>

app/views/student_work/_student_work_list.html.erb

@@ -0,0 +1,36 @@
+<div class="fl" style="border-bottom:1px solid #eaeaea; padding-bottom:10px; width:720px;">
+  <span class="c_dark f14 fb fl mr30">
+      作品
+      <font class="f12 c_red">
+        （<%= @stundet_works.count%>）
+      </font>
+  </span>
+  <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
+      <div class="hworkSearchBox">
+        <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
+        <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
+      </div>
+      <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
+  <% end%>
+</div>
+<div class="cl"></div>
+
+<div class="fl">
+  <% if @is_evaluation && !@stundet_works.empty?%>
+      <%= render :partial => "evaluation_title"%>
+  <% else%>
+      <%= render :partial => "evaluation_un_title"%>
+  <% end%>
+</div>
+<div class="cl"></div>
+
+<% @stundet_works.each do |student_work|%>
+    <% if @is_evaluation%>
+        <%= render :partial => "evaluation_work", :locals => {:student_work => student_work}%>
+    <% else%>
+        <%= render :partial => "evaluation_un_work", :locals => {:student_work => student_work}%>
+    <% end%>
+    <div class="cl"></div>
+    <div id="about_hwork_<%= student_work.id%>"></div>
+    <div class="cl"></div>
+<% end%>

app/views/student_work/_student_work_score.html.erb

@@ -1,24 +1,31 @@
-<ul class="ping_box_ul ping_line">
+<ul class="ping_box_ul <%= is_last ? '' : 'ping_line'%> fl">
   <% 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>
+  <div class="pingBoxTit">
+    <%= 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 => "linkBlue 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>
+    <a href="javascript:void(0);" class="c_orange fl" >
+      <%= score.score%>分
+    </a>
+    <a href="javascript:void(0);" class="fr linkBlue mr5" onclick="$('#add_score_reply_<%= score.id%>').slideToggle();">回复</a>
     <span class=" fr c_grey mr20">
       <%=format_time score.updated_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}%>
+      <%= render :partial => 'add_score_reply',:locals => {:score => score,:is_last => is_last}%>
     </div>
     <div class="cl"></div>
 
@@ -27,6 +34,6 @@
           <%= render :partial => 'jour_replay',:locals => {:jour => jour}%>
       <% end%>
     </div>
-  </div>
     <div class="cl"></div>
+  </div>
 </ul>

app/views/student_work/_student_work_title.html.erb

@@ -1,37 +0,0 @@
-<li class="hwork_num ">
-  <span class="c_dark f14 fb fl">学号</span>
-</li>
-<li class=" hwork_name f14 fb c_dark">
-  <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "name"%>
-      <%= link_to "",student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>
-<li class="hwork_tit_une">
-  <span class="c_dark f14 fb fl">作品名称</span>
-</li>
-<li class=" hwork_time f14 fb c_dark">
-  <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "created_at"%>
-      <%= link_to "",student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>
-<li class="mr5 w40 ml15">
-  <%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "teacher_score"%>
-      <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>
-<li class="mr5 w40 ml20">
-  <%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "teaching_asistant_score"%>
-      <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-
-  <% end%>
-</li>
-<li class="ml20">
-  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
-  <% if @show_all && @order == "score"%>
-      <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
-  <% end%>
-</li>

app/views/student_work/_work_attachments.html.erb

@@ -1,8 +1,8 @@
 <% attachments.each_with_index do |attachment,i| %>
     <div id="attachment_<%= attachment.id%>">
-      <%= link_to_short_attachment attachment, :class => 'link_file', :download => true -%>
-      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
-      <span class="ml5">(<%= number_to_human_size attachment.filesize %>)</span>
+      <%= link_to_short_attachment attachment, :class => 'link_file_a fl', :download => true -%>
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :format => 'js'), :method => 'delete', :remote => true, :title => '删除', :class => 'remove-upload fl', :confirm => l(:text_are_you_sure)) if attachment.id && User.current == attachment.author %>
+      <span class="ml5 fl">(<%= number_to_human_size attachment.filesize %>)</span>
       <div class="cl"></div>
     </div>
 <% end -%>

app/views/student_work/add_score.js.erb

@@ -2,39 +2,16 @@ $("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :parti
 $('#score_<%= @work.id%>').peSlider({range: 'min'});
 
 <% if @is_new%>
-    $("#score_list_<%= @work.id%>").prepend("<div id='work_score_<%= @score.id%>'><%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %></div>");
+    $("#score_list_<%= @work.id%>").find("div:last").find("ul").addClass("ping_line");
+    $("#score_list_<%= @work.id%>").prepend("<div id='work_score_<%= @score.id%>'><%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => true}) %></div>");
 <% else %>
-    $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+    $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => @is_last}) %>");
 <% end%>
 
 $("#score_list_<%= @work.id%>").removeAttr("style");
 
 <% if @is_teacher %>
-    <% if @homework.homework_type == 1%>
-        $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_student_work',:locals => {:student_work => @work}) %>");
-    <% elsif @homework.homework_type == 2%>
-        $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_student_work',:locals => {:student_work => @work}) %>");
-    <% else%>
-        $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'student_work',:locals => {:student_work => @work}) %>");
-    <% end%>
+    $("#student_work_<%= @work.id%>").replaceWith("<%= escape_javascript(render :partial => 'evaluation_un_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){
-        $(this).find("div").show();
-    });
-    $(".student_score_info").bind("mouseout",function(e){
-        $(this).find("div").hide();
-    });
-    //最终成绩提示
-    $(".student_final_scor_info").bind("mouseover",function(e){
-        $(this).find("div").show();
-    });
-    $(".student_final_scor_info").bind("mouseout",function(e){
-        $(this).find("div").hide();
-    });
-});

app/views/student_work/add_score_reply.js.erb

@@ -1,4 +1,4 @@
-$("#add_score_reply_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'add_score_reply', :locals => {:score => @score}) %>");
+$("#add_score_reply_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'add_score_reply', :locals => {:score => @score,:is_last => @is_last}) %>");
 <% if @status && @status == 1%>
     $("#replay_histroy_<%= @score.id%>").prepend("<%= escape_javascript(render :partial => 'jour_replay', :locals => {:jour => @jour}) %>");
     $("#add_score_reply_<%= @score.id%>").hide();

app/views/student_work/index.html.erb

@@ -1,5 +1,12 @@
 <script type="text/javascript">
-  <% if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher && @stundet_works.count > 1%>
+  $(function(){
+      $("#RSide").removeAttr("id");
+      $("#homework_page_right").css("min-height",$("#LSide").height()-30);
+      $("#Container").css("width","1000px");
+  });
+
+    // 匿评弹框提示
+  <% if @is_evaluation && !@stundet_works.empty?%>
       $(function(){
           $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/praise_alert') %>');
           showModal('ajax-modal', '500px');
@@ -10,212 +17,81 @@
           $('#ajax-modal').parent().addClass("anonymos");
       });
   <% end%>
+
+  //设置评分规则
+  function set_score_rule(){
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework}) %>');
+      showModal('ajax-modal', '350px');
+      $('#ajax-modal').siblings().remove();
+      $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+      "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+      $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed");
+  }
+
 </script>
 
-<div class="project_r_h">
-  <div id="menu_r">
+<div class="homepageRight mt0 ml10">
+  <div class="resources" id="homework_page_right">
+    <div class="hworkListBanner">
+      <div id="menu_r" class="fl">
         <ul class="menu_r">
           <li><a href="javascript:void(0);" class="parent">作业批次</a>
             <ul>
-          <% @homework_commons.each_with_index { |homework_common,index |%>
+              <% @homework_commons.each_with_index do |homework_common,index |%>
                   <li>
                     <%= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%>
                   </li>
-          <%}%>
+              <% end%>
             </ul>
-      </li><!---level1 end--->
-    </ul><!---menu_r end--->
-  </div>
-</div><!--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>
+          </li>
+          <!---level1 end--->
         </ul>
+        <!---menu_r end--->
       </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" id="course_student_name" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);">
-        <%= select_tag(:late_penalty,options_for_select(course_group_list(@course),@group), {:class => "fl h22 w100 ml10"}) if(@is_teacher && course_group_list(@course).count > 0)  %>
-        <a class="student_work_search fl" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
-        <%= link_to("缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank") if((@is_teacher || User.current.admin?) && @homework.homework_type == 1) %>
-      <% end%>
+      <!--div class="hworkInfor"><a href="javascript:void(0);" class="linkBlue">作业信息</a></div-->
       <% if @is_teacher%>
-          <div class="fr">
-            <% unless @homework.homework_type == 2%>
+          <div class="fr mt5">
+            <ul class="resourcesSelect">
+              <li class="resourcesSelected">
+                <a href="javascript:void(0);" class="resourcesIcon"></a>
+                <ul class="hworkMenu">
+                  <li>
+                    <%= link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :group => @group, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => "export_student_work"%>
+                  </li>
+                  <li>
                     <% if @homework.student_works.empty?%>
-                    <%= link_to "附件", "javascript:void(0)", class: "down_btn fr zip_download_alert", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
+                        <%= link_to "导出作业附件", "javascript:void(0)", class: "hworkExport resourcesGrey", :onclick => "alert('没有学生提交作业，无法下载附件')" %>
                     <% else%>
-                    <%= link_to "附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
-                                remote: true, class: "down_btn fr zip_download_alert", :id => "download_homework_attachments" %>
-                <% end%>
-                <div class="info_ni_download" style="<%= @homework.homework_type == 1 ? '' : 'margin-left: 130px;'%>">
-                  使用
-                  <span class="c_red">winzip</span>
-                  工具进行解压可能会导致
-                  <span class="c_red">下载文件乱码</span>
-                  ，建议您使用
-                  <span class="c_red">winrar</span>
-                  工具进行解压
-                </div>
-            <% end%>
-            <%= link_to("匿评", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr') if @homework.homework_type == 1%>
-            <%= link_to("缺评", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr') if @homework.homework_type == 1%>
-            <%= 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--->
-    <div class="cl"></div>
-
-    <% if @is_evaluation%>
-        <ul class="hwork_ul">
-          <%= render :partial => 'evaluation_work_title'%>
-        </ul><!---hwork_ul end-->
-        <div class="cl"></div>
-        <% @stundet_works.each do |student_work|%>
-            <%= render :partial => "evaluation_work",:locals => {:student_work => student_work}%>
-            <div id="about_hwork_<%= student_work.id%>" ></div>
-        <% end%>
-    <% else %>
-        <% if @homework.homework_type == 1 || @homework.homework_type == 2%>
-            <ul class="hwork_ul">
-              <%= render :partial => 'evaluation_student_work_title'%>
-            </ul><!---hwork_ul end-->
-            <div class="cl"></div>
-            <% @stundet_works.each do |student_work|%>
-                <%= render :partial => "evaluation_student_work",:locals => {:student_work => student_work}%>
-                <div id="about_hwork_<%= student_work.id%>" ></div>
-            <% end%>
-        <% else%>
-            <ul class="hwork_ul">
-              <%= render :partial => 'student_work_title'%>
-            </ul><!---hwork_ul end-->
-            <div class="cl"></div>
-            <% @stundet_works.each do |student_work|%>
-                <%= render :partial => "student_work",:locals => {:student_work => student_work}%>
-                <div id="about_hwork_<%= student_work.id%>" ></div>
-            <% end%>
-        <% end%>
+                        <%= link_to "导出作业附件", zipdown_assort_path(obj_class: @homework.class, obj_id: @homework, format: :json),
+                                    remote: true, class: "hworkExport resourcesGrey", :id => "download_homework_attachments" %>
                     <% 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)%>
-        <% 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 %>
+                  </li>
+                  <li>
+                    <%= link_to("导出缺评情况", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+                  </li>
+                  <li>
+                    <%= link_to("导出匿评情况", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'hworkExport resourcesGrey')%>
+                  </li>
+                  <li>
+                    <a href="javascript:void(0);" class="hworkSetting resourcesGrey" onclick="set_score_rule();">评分设置</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
           </div>
-        <div class="cl"></div>
-
-        <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
-            <% if @is_teacher%>
-                <table class="border_ce" cellpadding="0" cellspacing="0">
-                  <tbody>
-                  <tr class="<%= cycle("", "b_grey") %>">
-                    <td  class="td_tit">
-                      输入
-                    </td>
-                    <td  class="td_tit">
-                      输出
-                    </td>
-                  </tr>
-                  <% @homework.homework_tests.each do |test|%>
-                      <tr class="<%= cycle("", "b_grey") %>">
-                        <td  class="td_tit">
-                          <%=test.input%>
-                        </td>
-                        <td  class="td_tit">
-                          <%= test.output%>
-                        </td>
-                      </tr>
       <% end%>
-                  </tbody>
-                </table>
       <div class="cl"></div>
-            <% end%>
-
-            <div class="mt5">
-              <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
-              <div class="fl">
-                <% if @homework.homework_detail_programing.language.to_i == 1%>
-                    C
-                <% elsif @homework.homework_detail_programing.language.to_i == 2%>
-                    C++
-                <% end%>
-              </div>
     </div>
-            <div class="cl"></div>
-        <% end%>
 
-        <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 class="hworkListContainer">
+      <div class="ctt2">
+        <div class="dis" id="homework_student_work_list">
+          <%= render :partial => "student_work/student_work_list"%>
         </div>
-        <div class="cl"></div>
-
-        <!--div class="mt5">
-          <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
-          <div class="fl mb5 c_red">
-            <%# if @homework.homework_type == 1%>
-                <%#= scoring_rules @homework.late_penalty,@homework.id,@is_teacher,@homework.homework_detail_manual.absence_penalty%>
-            <%# else%>
-                <%#= scoring_rules @homework.late_penalty,@homework.id,@is_teacher%>
-            <%# end%>
       </div>
     </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 class="cl"></div>
   </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-->

app/views/student_work/index.js.erb

@@ -0,0 +1,2 @@
+$("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
+$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");

app/views/student_work/new.html.erb

@@ -7,14 +7,20 @@
         $('#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","30%").css("left","40%");
+        $('#ajax-modal').parent().css("top","65%").css("left","60%");
         $('#ajax-modal').parent().addClass("anonymos_work");
-//        alert("当前作业已开启匿评，您提交作品后将不会收到任何匿评作品，您的作品也不会被其他用户匿评，如需获得最终成绩，请您联系主讲老师对您的作品单独进行评分");
     });
   <% end%>
 
-  //匿评弹框取消按钮
-  function clickCanel(){hideModal("#popbox02");}
+  //快速创建项目的弹框
+  function new_project(){
+      $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/new_project') %>');
+      showModal('ajax-modal', '800px');
+      $('#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","30%").css("left","20%").css("position","fixed");
+  }
 </script>
 
 <div class="homepageRightBanner mb10">
@@ -75,6 +81,18 @@
           <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
         </div>
 
+        <div class="mt5 fl">
+            <a href="javascript:void(0);" class="RalationIcon fl  mt3" onclick="show_project();">关联项目</a>
+        </div>
+        <div class="cl"></div>
+
+        <div class="mt10 none" id="about_project">
+          <%= select_tag :project_id, options_for_select(user_projects_option, @student_work.project_id), {:class => "InputBox  W680 fl"} %>
+          <%#=link_to "", new_project_path, :class => "ml5 mt5 SetUpIcon fl", :title => "快速创建"%>
+          <a class=" ml5 mt5 SetUpIcon fl" href="javascript:void(0)" title="快速创建" onclick="new_project();"></a>
+          <div class="cl"></div>
+        </div>
+
         <div class="mt5">
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="new_student_work();">确定</a>
           <span class="fr mr10 mt3">或</span>

app/views/student_work/show.js.erb

@@ -1,7 +1,7 @@
-if($("#about_hwork_<%= @work.id%>").children().length > 0)
-  {$("#about_hwork_<%= @work.id%>").html("");}
-else
-  {
+if($("#about_hwork_<%= @work.id%>").children().length > 0){
+  $("#about_hwork_<%= @work.id%>").html("");
+}
+else{
   <% if @homework.homework_type == 2%>
     $("#about_hwork_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show') %>");
   <% else%>

app/views/users/_activity_new_score_index.html.erb

@@ -1,4 +1,3 @@
-
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.tramples')%> * (-2) = <%= option_num.tread %> * (-2) = <%= option_num.tread * (-2) %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.like.level1')%> * 4 = <%= option_num.praise_by_one %> * 4 = <%= option_num.praise_by_one * 4 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.like.level2')%> * 6 = <%= option_num.praise_by_two %> * 6 = <%= option_num.praise_by_two * 6 %></div>

app/views/users/_course_homework.html.erb

@@ -6,22 +6,43 @@
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
         <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% end %> TO <!--+"(课程名称)" -->
-        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id), :class => "newsBlue ml15"%>
-      </div>
-      <div class="homepagePostTitle break_word"> <!--+"(作业名称)"-->
-        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey"%>
-      </div>
+        <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
+      </div>
+      <div class="homepagePostTitle hidden m_w530 fl"> <!--+"(作业名称)"-->
+        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
+      </div>
+      <% if activity.homework_detail_manual.comment_status == 1%>
+          <span class="grey_btn_cir ml10">未开启匿评</span>
+      <% elsif activity.homework_detail_manual.comment_status == 2%>
+          <span class="green_btn_cir ml10">匿评中</span>
+      <% elsif activity.homework_detail_manual.comment_status == 3%>
+          <span class="grey_btn_cir ml10">匿评已结束</span>
+      <% end%>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
-          <%= student_work_activity_submit_status(homework: activity) %>
+          <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
+          <%= user_for_homework_common activity,is_teacher %>
+        </div>
+
+        <% if activity.homework_type == 2 && is_teacher%>
+            <div class="homepagePostSubmit">
+              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
+            </div>
+        <% end %>
+        <% if activity.homework_type == 2%>
+            <div class="homepagePostDeadline mr15">
+              语言：
+              <%= activity.language_name%>
             </div>
+        <% end %>
+
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <%= activity.description.html_safe %>
       </div>
       <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity_id %>">

app/views/users/_course_message.html.erb

@@ -1,31 +1,30 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word">
         <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle break_word">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-            <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %>
+            <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id,:host=> Setting.host_course), :class=> "postGrey" %>
         <% else %>
-            <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"%>
+            <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id,:host=> Setting.host_course), :class=> "postGrey"%>
         <% end %>
       </div>
       <div class="homepagePostDate">
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
 
-
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
@@ -46,15 +45,16 @@
     </div>
     <div class="cl"></div>
   </div>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
   <% count=0 %>
-      <div class="homepagePostReplyBannerCount">回复(
   <% if activity.parent %>
       <% count=activity.parent.children.count%>
   <% else %>
       <% count=activity.children.count%>
   <% end %>
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
         <%= count %>
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
@@ -67,21 +67,6 @@
       <% end %>
     </div>
 
-    <div class="homepagePostReplyInputContainer">
-      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-        <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-            <input type="hidden" name="quote[quote]" value="">
-            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-            <p nhname='contentmsg_<%= user_activity_id%>'></p>
-            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
-            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
-            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">发送</a>
-        <% end%>
-      </div>
-      <div class="cl"></div>
-    </div>
-
     <% activity= activity.parent ? activity.parent : activity%>
     <% replies_all_i = 0 %>
     <%  if count > 0 %>
@@ -91,18 +76,18 @@
                 <% replies_all_i=replies_all_i+1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33", :class =>"mt8"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher">
                       <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word">
+                    <div class="homepagePostReplyContent break_word list_style">
                       <%= reply.content.html_safe %>
                     </div>
                   </div>
@@ -112,5 +97,25 @@
           </ul>
         </div>
     <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer  mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="quote[quote]" value="">
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left; margin-left: 5px; padding-top:3px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+          <div class="cl"></div>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
   </div>
 </div>

app/views/users/_course_news.html.erb

@@ -18,16 +18,17 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
+      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id %>">
         <%= activity.description.html_safe %>
       </div>
     </div>
     <div class="cl"></div>
   </div>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
   <% count=activity.comments.count %>
-      <div class="homepagePostReplyBannerCount">
+  <div class="homepagePostReply">
+    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
+    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
+      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
         回复（<%= count %>）
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
@@ -40,20 +41,6 @@
       <% end %>
     </div>
 
-    <div class="homepagePostReplyInputContainer">
-      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-        <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-            <p nhname='contentmsg_<%= user_activity_id%>'></p>
-            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
-            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:6px;">取消</a>
-            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:6px;">发送</a>
-        <% end%>
-      </div>
-      <div class="cl"></div>
-    </div>
-
     <% replies_all_i = 0 %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
@@ -73,7 +60,7 @@
                       <% end %>
                       <%= format_time(comment.created_on) %>
                     </div>
-                    <div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
+                    <div class="homepagePostReplyContent break_word list_style"><%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>
@@ -81,5 +68,23 @@
           </ul>
         </div>
     <% end %>
+
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyInputContainer mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div>
   </div>
 </div>