Merge remote-tracking branch 'origin/szzh' into szzh

Gemfile

@@ -26,6 +26,7 @@ gem 'spreadsheet'
 gem 'ruby-ole'
 gem 'rails_kindeditor',path:'lib/rails_kindeditor'
 #gem "rmagick", ">= 2.0.0"
+gem 'binding_of_caller'
 
 group :development do
   gem 'grape-swagger'

app/controllers/homework_common_controller.rb

@@ -1,6 +1,8 @@
 class HomeworkCommonController < ApplicationController
+  require 'net/http'
+  require 'json'
   layout "base_courses"
-  before_filter :find_course, :only => [:index,:new,:create]
+  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 :member_of_course, :only => [:index]
@@ -16,20 +18,37 @@ class HomeworkCommonController < ApplicationController
   end
 
   def new
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  #新建作业下一步
+  def next_step
+    @homework_type = params[:homework_common_type]
+
     @homework = HomeworkCommon.new
     @homework.safe_attributes = params[:homework_common]
     @homework.late_penalty = 0
     @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
     @homework.publish_time = Time.now.strftime('%Y-%m-%d')
 
-    #匿评作业相关属性
-    @homework_detail_manual = HomeworkDetailManual.new
-    @homework_detail_manual.ta_proportion = 0.6
-    @homework_detail_manual.absence_penalty = 0
-    @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
+    if @homework_type == "1"
+      #匿评作业相关属性
+      @homework_detail_manual = HomeworkDetailManual.new
+      @homework_detail_manual.ta_proportion = 0.6
+      @homework_detail_manual.absence_penalty = 0
+      @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
@@ -50,15 +69,57 @@ class HomeworkCommonController < ApplicationController
       homework.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(homework)
 
-      #匿评作业相关属性
-      homework_detail_manual = HomeworkDetailManual.new
-      homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
-      homework_detail_manual.comment_status = 1
-      homework_detail_manual.evaluation_start = params[:evaluation_start]
-      homework_detail_manual.evaluation_end = params[:evaluation_end]
-      homework_detail_manual.evaluation_num = params[:evaluation_num]
-      homework_detail_manual.absence_penalty = params[:absence_penalty]
-      homework.homework_detail_manual = homework_detail_manual
+      if homework.homework_type == 2
+        homework_detail_programing = HomeworkDetailPrograming.new
+        homework_detail_programing.language = "C++"
+        homework_detail_programing.standard_code = params[:standard_code]
+
+        question = {title:homework.name,content:homework.description}
+        question[:input] = []
+        question[:output] = []
+        if params[:input] && params[:output]
+          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.homework_tests << homework_test
+              question[:input] << homework_test.input
+              question[:output] << homework_test.output
+            end
+          end
+        end
+
+        # uri = URI('http://test.gitlab.trustie.net/api/questions.json')
+        # req = Net::HTTP::Post.new(uri, initheader = {'Content-Type' =>'application/json'})
+        # req.body = question.to_json
+        # res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+        #   http.request(req)
+        # 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
         respond_to do |format|
@@ -90,7 +151,7 @@ class HomeworkCommonController < ApplicationController
     @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.homework_type = params[:homework_common][:homework_type] if params[:homework_common][:homework_type]
     unless @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 = params[:late_penalty]
@@ -98,10 +159,10 @@ class HomeworkCommonController < ApplicationController
       end
       @homework.late_penalty = params[:late_penalty]
     end
-    @homework.course_id = @course.id
+    # @homework.course_id = @course.id
 
     #匿评作业相关属性
-    if @homework.homework_type == 1
+    if @homework.homework_type == 1 && @homework_detail_manual
       @homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
       @homework_detail_manual.evaluation_start = params[:evaluation_start]
       @homework_detail_manual.evaluation_end = params[:evaluation_end]
@@ -117,18 +178,49 @@ class HomeworkCommonController < ApplicationController
         end
         @homework_detail_manual.absence_penalty = params[:absence_penalty]
       end
-    else #不是匿评作业，缺评扣分为0分，每个作品的缺评扣分改为0分，防止某些作业在结束匿评之后改为普通作业
+    elsif @homework.homework_type == 0 #普通作业，缺评扣分为0分，每个作品的缺评扣分改为0分，防止某些作业在结束匿评之后改为普通作业
       @homework.student_works.where("absence_penalty != 0").each do |student_work|
         student_work.late_penalty = 0
         student_work.save
       end
-      @homework_detail_manual.absence_penalty = 0
+      @homework_detail_manual.absence_penalty = 0 if @homework_detail_manual
+    end
+
+    if @homework.homework_type == 2 && @homework_detail_programing #编程作业
+      @homework_detail_programing.language = "C++"
+      @homework_detail_programing.standard_code = params[:standard_code]
+      homework_tests = @homework.homework_tests
+      #需要删除的测试
+      ids = homework_tests.map(&:id) - params[:input].keys.map(&:to_i)
+      ids.each do |id|
+        homework_test = HomeworkTest.find id
+        homework_test.destroy if homework_test
+      end
+      if params[:input] && params[:output]
+        params[:input].each do |k,v|
+          if params[:output].include? k
+            homework_test = HomeworkTest.find_by_id k
+            if homework_test #已存在的测试，修改
+              homework_test.input = v
+              homework_test.output = params[:output][k]
+            else #不存在的测试，增加
+              homework_test = HomeworkTest.new
+              homework_test.input = v
+              homework_test.output = params[:output][k]
+              homework_test.homework_common = @homework
+            end
+            homework_test.save
+          end
+        end
+      end
     end
 
     @homework.save_attachments(params[:attachments])
     render_attachment_warning_if_needed(@homework)
 
-    if @homework.save && @homework_detail_manual.save
+    if @homework.save
+      @homework_detail_manual.save if @homework_detail_manual
+      @homework_detail_programing.save if @homework_detail_programing
       respond_to do |format|
         format.html {
           flash[:notice] = l(:notice_successful_edit)
@@ -227,6 +319,7 @@ class HomeworkCommonController < ApplicationController
   def find_homework
     @homework = HomeworkCommon.find params[:id]
     @homework_detail_manual = @homework.homework_detail_manual
+    @homework_detail_programing = @homework.homework_detail_programing
     @course = @homework.course
   rescue
     render_404

app/controllers/my_controller.rb

@@ -25,6 +25,7 @@ class MyController < ApplicationController
   helper :issues
   helper :users
   helper :custom_fields
+  helper :user_score
 
   BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
              'issuesreportedbyme' => :label_reported_issues,
@@ -88,6 +89,23 @@ class MyController < ApplicationController
     end
   end
 
+  def clear_user_avatar_temp
+    @user = User.current
+    diskfile = disk_filename('User', @user.id)
+    diskfile1 = diskfile + 'temp'
+    File.delete(diskfile1) if File.exist?(diskfile1)
+  end
+  def save_user_avatar
+    @user = User.current
+    diskfile = disk_filename('User', @user.id)
+    diskfile1 = diskfile + 'temp'
+    begin
+      FileUtils.mv diskfile1, diskfile, force: true if File.exist? diskfile1
+    ensure
+      File.delete(diskfile1) if File.exist?(diskfile1)
+    end
+  end
+
   # Edit user's account
   def account
     @user = User.current
@@ -119,6 +137,8 @@ class MyController < ApplicationController
         @se.identity = params[:identity].to_i if params[:identity]
         @se.technical_title = params[:technical_title] if params[:technical_title]
         @se.student_id = params[:no] if params[:no]
+        @se.brief_introduction = params[:brief_introduction]
+        @se.description = params[:description]
 
         if @user.save && @se.save
           # 头像保存
@@ -137,6 +157,7 @@ class MyController < ApplicationController
       File.delete(diskfile1) if File.exist?(diskfile1)
     end
 
+    render :layout=>'base_users_new'
   end
 
   # Destroys user's account
@@ -159,6 +180,8 @@ class MyController < ApplicationController
 
   # Manage user's password
   def password
+  begin
+    @act='password'
     @user = User.current
     unless @user.change_password_allowed?
       flash.now[:error] = l(:notice_can_t_change_password)
@@ -174,16 +197,20 @@ class MyController < ApplicationController
         Token.delete_user_all_tokens(@user)
         logout_user
         redirect_to signin_url(back_url: my_account_path)
+        return
       else
-        flash.now[:error] = l(:notice_account_wrong_password)
+        #flash.now[:error] = l(:notice_account_wrong_password)
       end
     end
   rescue Exception => e
     if e.message == 'wrong password'
-      flash.now[:error] = l(:notice_account_wrong_password)
+      # flash.now[:error] = l(:notice_account_wrong_password)
     else
-      flash.now[:error] = e.message
+      # flash.now[:error] = e.message
     end
+    flash.now[:error] = l(:notice_account_old_wrong_password)
+  end
+  render :template => 'my/account',:layout=>'base_users_new'
   end
 
   # Create a new feeds key

app/controllers/poll_controller.rb

@@ -23,7 +23,7 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
-    if @poll.polls_status != 2 && !User.current.allowed_to?(:as_teacher,@course)
+    if @poll.polls_status != 2 && (!User.current.allowed_to?(:as_teacher,@course) || User.current.admin?)
       render_403
       return
     end
@@ -393,7 +393,7 @@ class PollController < ApplicationController
   end
 
   def is_member_of_course
-    render_403 unless(@course && User.current.member_of_course?(@course))
+    render_403 unless(@course && (User.current.member_of_course?(@course) || User.current.admin?))
   end
 
   def is_course_teacher

app/controllers/repositories_controller.rb

@@ -250,6 +250,14 @@ update
         return -1
       end
     end
+
+    if params[:to] == 'gitlab'
+      g = Gitlab.client
+      g.post('/session', body: {email: User.current.mail, password: User.current.hashed_password})
+      redirect_to "http://192.168.41.130:3000/gitlab-org/gitlab-shell/tree/master"
+      return
+    end
+
     #if( !User.current.member_of?(@project) || @project.hidden_repo)
     @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty?
 
@@ -540,11 +548,12 @@ update
       :stack => :side,
       :scale_integers => true,
       :step_x_labels => 2,
-      :show_data_values => false,
+      :show_data_values => true,
       :graph_title => l(:label_commits_per_month),
       :show_graph_title => true
     )
 
+    # 具状图
     graph.add_data(
       :data => commits_by_month[0..11].reverse,
       :title => l(:label_revision_plural)
@@ -560,7 +569,7 @@ update
 
   def graph_commits_per_author(repository)
     commits_by_author = Changeset.count(:all, :group => :committer, :conditions => ["repository_id = ?", repository.id])
-    commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}
+    commits_by_author = commits_by_author.to_a.sort! {|x, y| x.last <=> y.last}.last(25)
 
     changes_by_author = Change.count(:all, :group => :committer, :include => :changeset, :conditions => ["#{Changeset.table_name}.repository_id = ?", repository.id])
     h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
@@ -582,7 +591,7 @@ update
       :fields => fields,
       :stack => :side,
       :scale_integers => true,
-      :show_data_values => false,
+      :show_data_values => true,
       :rotate_y_labels => false,
       :graph_title => l(:label_commits_per_author),
       :show_graph_title => true

app/controllers/student_work_controller.rb

@@ -2,47 +2,88 @@ class StudentWorkController < ApplicationController
   layout "base_courses"
   include StudentWorkHelper
   require 'bigdecimal'
+  require "base64"
   before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list]
   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
 
   def index
-    @order,@b_sort,@name = params[:order] || "score",params[:sort] || "desc",params[:name] || ""
+    @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
-    #老师 || 非匿评作业 || 匿评结束 显示所有的作品
-    @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("*,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("*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
-        end
-      else #剩余情况： 学生 && 非匿评作业 如果未提交作品，只能看到自己的，提交了作品，能看到所有作品
-        my_work = @homework.student_works.select("*,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
+    course_group = CourseGroup.find_by_id(@group) if @group
+    if course_group
+      group_students = course_group.users
+      if group_students.empty?
+        student_in_group = '(0)'
+      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("*,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
+            @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
+          end
+        else #剩余情况： 学生 && 非匿评作业 如果未提交作品，只能看到自己的，提交了作品，能看到所有作品
+          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
-            @stundet_works = search_homework_member @homework.student_works.select("*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+            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
+            end
           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
-    else #学生
-      if @homework.homework_detail_manual.comment_status == 1 #未开启匿评，只显示我的作品
-        @stundet_works = @homework.student_works.select("*,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}
+    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 #剩余情况： 学生 && 非匿评作业 如果未提交作品，只能看到自己的，提交了作品，能看到所有作品
+          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
+            end
+          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")
-    @homework_commons = @course.homework_commons.order("created_at desc")
     @score = @b_sort == "desc" ? "asc" : "desc"
     respond_to do |format|
       format.html
@@ -80,7 +121,24 @@ class StudentWorkController < ApplicationController
         stundet_work.late_penalty = 0
       end
       render_attachment_warning_if_needed(stundet_work)
+
       if stundet_work.save
+        if @homework.homework_type == 2 && @homework.homework_detail_programing       #编程作业，学生提交作品后计算系统得分
+          url = "http://192.168.80.21:8080/api/questions/#{@homework.homework_detail_programing.question_id}/solutions.json"
+          solutions = {
+              student_work_id:stundet_work.id,
+              src:Base64.encode64(stundet_work.description),
+              language:1
+          }
+          uri = URI(url)
+          body = solutions.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
+        end
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -99,8 +157,12 @@ class StudentWorkController < ApplicationController
   end
 
   def edit
-    respond_to do |format|
-      format.html
+    if @homework.homework_type == 2   #编程作业不能修改作业
+      render_403
+    else
+      respond_to do |format|
+        format.html
+      end
     end
   end
 
@@ -135,7 +197,9 @@ class StudentWorkController < ApplicationController
   end
 
   def destroy
-    if @work.destroy
+    if @homework.homework_type == 2  #编程作业，作品提交后不可以删除
+      render_403
+    elsif @work.destroy
       respond_to do |format|
         format.html {
           redirect_to student_work_index_url(:homework => @homework.id)
@@ -154,6 +218,12 @@ class StudentWorkController < ApplicationController
     if @score
       @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
       @score.score = params[:score] if params[:score]
+      if User.current.admin?
+        @score.reviewer_role = 1
+      else
+        role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+        @score.reviewer_role = get_role_by_name(role)
+      end
       @is_new = false
     else
       @score = StudentWorksScore.new
@@ -161,8 +231,12 @@ class StudentWorkController < ApplicationController
       @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
       @score.user_id = User.current.id
       @score.student_work_id = @work.id
-      role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
-      User.current.admin? ? @score.reviewer_role = 1 : @score.reviewer_role = get_role_by_name(role)
+      if User.current.admin?
+        @score.reviewer_role = 1
+      else
+        role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+        @score.reviewer_role = get_role_by_name(role)
+      end
       @is_new = true
     end
 
@@ -180,8 +254,10 @@ class StudentWorkController < ApplicationController
             if @work.student_score.nil?
               @work.final_score = @work.teaching_asistant_score
             else
-              final_ta_score = BigDecimal.new("#{@work.teaching_asistant_score}") * BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}")
-              final_s_score = BigDecimal.new("#{@work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{@homework.homework_detail_manual.ta_proportion}"))
+              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
@@ -303,6 +379,45 @@ 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_test = homework_common.homework_tests.where("input = '#{result[:input]}' AND output = '#{result[:output]}'").first
+        if 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.save!
+        end
+      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)
+          end
+        end
+
+        stundet_work.save!
+      end
+    end
+  end
+
   private
   #获取作业
   def find_homework

app/controllers/watchers_controller.rb

@@ -16,12 +16,15 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class WatchersController < ApplicationController
   before_filter :require_login#, :find_watchables, :only => [:watch, :unwatch]
+
+  helper :users
+
   def watch
     s = WatchesService.new
     watchables = s.watch params.merge(:current_user_id => User.current.id)
     respond_to do |format|
       format.html { redirect_to_referer_or {render :text => (true ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables} }
+      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables,:params=>params,:opt=>'add'} }
     end
   rescue Exception => e
     if e.message == "404"
@@ -37,7 +40,7 @@ class WatchersController < ApplicationController
     watchables = s.unwatch  params.merge(:current_user_id => User.current.id)
     respond_to do |format|
       format.html { redirect_to_referer_or {render :text => (false ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables} }
+      format.js { render :partial => 'set_watcher', :locals => {:user => User.current, :watched => watchables,:params=>params,:opt=>'delete'} }
     end
   rescue Exception => e
     if e.message == "404"

app/controllers/words_controller.rb

@@ -13,11 +13,12 @@ class WordsController < ApplicationController
         end
         refer_user_id = params[:new_form][:reference_user_id].to_i
         
-        @user.add_jour(User.current, message, refer_user_id)
+        list = @user.add_jour(User.current, message, refer_user_id)
         unless refer_user_id == 0 || refer_user_id == User.current.id
-          User.find(refer_user_id).add_jour(User.current, message, refer_user_id)
+          list = User.find(refer_user_id).add_jour(User.current, message, refer_user_id)
         end
-        @user.count_new_jour
+        @jour = list.last
+        # @user.count_new_jour
         # if a_message.size > 5
           # @message = a_message[-5, 5]
         # else
@@ -26,8 +27,8 @@ class WordsController < ApplicationController
         # @message_count = a_message.count
       end
     end
-    @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse
-    @jour = paginateHelper @jours,10
+    # @jours = @user.journals_for_messages.where('m_parent_id IS NULL').reverse
+    # @jour = paginateHelper @jours,10
 
     respond_to do |format|
      # format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}

app/helpers/activities_helper.rb

@@ -42,4 +42,33 @@ module ActivitiesHelper
     end
     sorted_events
   end
+
+  def get_container_type(activity)
+    if activity.act.nil?
+      return ['Unknow',0]
+    end
+    #问卷
+    if activity.act_type == 'Poll'
+      return ['Course',activity.act.polls_group_id]
+    end
+    #注册
+    if activity.act_type == 'Principal'
+      return ['Principal',activity.act.id]
+    end
+    #留言
+    if activity.act_type == 'JournalsForMessage'
+      return [activity.act.jour_type,activity.act.jour_id]
+    end
+
+    # HomeworkCommon Issue Journal Message News
+    if activity.act.respond_to?('course') && activity.act.course
+        return ['Course',activity.act.course.id]
+    end
+    if activity.act.respond_to?('project') && activity.act.project
+      return ['Project',activity.act.project.id]
+    end
+
+    # Contest Contestnotification
+    return ['Unknow',0]
+  end
 end

app/helpers/application_helper.rb

@@ -2292,6 +2292,8 @@ module ApplicationHelper
       else
         link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
       end
+    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
@@ -2305,6 +2307,8 @@ module ApplicationHelper
     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
       else
         link_to l(:label_edit_homework),  edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
       end
@@ -2324,7 +2328,7 @@ module ApplicationHelper
     elsif homework.homework_type == 0
       "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
     elsif homework.homework_type == 2
-      "<span class='fr mr10 pr_join_span '>编程作业</span>".html_safe
+      "<span class='fr mr10 pr_join_span '>&nbsp;编程作业&nbsp;&nbsp;</span>".html_safe
     end
   end
 
@@ -2339,4 +2343,36 @@ module ApplicationHelper
     end
   end
 
+  #将文本内的/n转换为<br>
+  def text_format text
+    text.gsub("&","&amp;").gsub("<","&lt;").gsub(">","&gt;").gsub("\n","<br/>").html_safe
+  end
+
+  #评分规则显示
+  def scoring_rules late_penalty,homework_id,is_teacher,absence_penalty=nil
+    if absence_penalty
+      if late_penalty.to_i == 0 && absence_penalty.to_i == 0
+        notice = "尚未设置评分规则"
+        if is_teacher
+          notice += "，请&nbsp" + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green")
+        end
+      elsif late_penalty.to_i != 0 && absence_penalty.to_i == 0
+        notice = "迟交扣#{late_penalty}分，缺评扣分未设置"
+      elsif late_penalty.to_i == 0 && absence_penalty.to_i != 0
+        notice = "迟交扣分未设置，缺评一个作品扣#{absence_penalty}分"
+      elsif late_penalty.to_i != 0 && absence_penalty.to_i != 0
+        notice = "迟交扣#{late_penalty}分，缺评一个作品扣#{absence_penalty}分"
+      end
+    else
+      if late_penalty.to_i == 0
+        notice = "尚未设置评分规则"
+        if is_teacher
+          notice += "，请&nbsp" + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green")
+        end
+      else
+        notice = "迟交扣#{late_penalty}分"
+      end
+    end
+    notice.html_safe
+  end
 end

app/helpers/homework_common_helper.rb

@@ -53,31 +53,4 @@ module HomeworkCommonHelper
     link
   end
 
-  #评分规则显示
-  def scoring_rules late_penalty,homework_id,is_teacher,absence_penalty=nil
-    if absence_penalty
-      if late_penalty.to_i == 0 && absence_penalty.to_i == 0
-        notice = "尚未设置评分规则"
-        if is_teacher
-          notice += "，请&nbsp" + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green")
-        end
-      elsif late_penalty.to_i != 0 && absence_penalty.to_i == 0
-        notice = "迟交扣#{late_penalty}分，缺评扣分未设置"
-      elsif late_penalty.to_i == 0 && absence_penalty.to_i != 0
-        notice = "迟交扣分未设置，缺评一个作品扣#{absence_penalty}分"
-      elsif late_penalty.to_i != 0 && absence_penalty.to_i != 0
-        notice = "迟交扣#{late_penalty}分，缺评一个作品扣#{absence_penalty}分"
-      end
-    else
-      if late_penalty.to_i == 0
-        notice = "尚未设置评分规则"
-        if is_teacher
-          notice += "，请&nbsp" + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green")
-        end
-      else
-        notice = "迟交扣#{late_penalty}分"
-      end
-    end
-    notice.html_safe
-  end
 end

app/helpers/student_work_helper.rb

@@ -80,4 +80,22 @@ module StudentWorkHelper
     end
     color
   end
+
+  #获取分班信息
+  def course_group_list course
+    result = []
+    if course.course_groups && !course.course_groups.empty?
+      base = []
+      base << l(:label_chose_group)
+      base << 0
+      result << base
+      course.course_groups.each do |group|
+        option = []
+        option << group.name
+        option << group.id
+        result << option
+      end
+    end
+    result
+  end
 end

app/helpers/users_helper.rb

@@ -303,4 +303,243 @@ module UsersHelper
       end
     end
   end
+
+  def get_watcher_users(obj)
+    count = User.watched_by(obj.id).count
+    if count == 0
+      return [0,[]]
+    end
+    list = User.watched_by(obj.id).order("#{Watcher.table_name}.id desc").limit(10).all
+    return [count,list];
+  end
+
+  def get_fans_users(obj)
+    count = obj.watcher_users.count
+    if count == 0
+      return [0,[]]
+    end
+    list = obj.watcher_users.order("#{Watcher.table_name}.id desc").limit(10).all
+    return [count,list];
+  end
+  def get_visitor_users(obj)
+    query = Visitor.where("master_id=?",obj.id)
+    count = query.count
+    if count == 0
+      return [0,[]]
+    end
+    list = query.order("updated_on desc").limit(10).all
+    return [count,list];
+  end
+
+  def get_create_course_count(user)
+    return Course.where("tea_id = ?",user.id).count()
+  end
+  def get_join_course_count(user)
+    return user.coursememberships.count() - get_create_course_count(user)
+  end
+  def get_homework_commons_count(user)
+    return HomeworkCommon.where("user_id = ?",user.id).count()
+  end
+  def get_projectandcourse_attachment_count(user)
+    return Attachment.where("author_id = ? and container_type in ('Project','Course')",user.id).count()
+  end
+  def get_create_project_count(user)
+    return Project.where("user_id = ? and project_type = ?",user.id,Project::ProjectType_project).count()
+  end
+  def get_join_project_count(user)
+    return user.memberships.count(conditions: "projects.project_type = #{Project::ProjectType_project}") - get_create_project_count(user)
+  end
+  def get_create_issue_count(user)
+    return Issue.where("author_id = ?",user.id).count()
+  end
+  def get_resolve_issue_count(user)
+    return Issue.where("assigned_to_id = ? and status_id=3",user.id).count()
+  end
+  def get_anonymous_evaluation_count(user)
+    return StudentWorksScore.where("user_id = ? and reviewer_role=3",user.id).count()
+  end
+
+
+  # def query_activities(query,type)
+  #   query_rec_count = 8
+  #   # query = query.where("act_type='JournalsForMessage'")
+  #   #query = query.where("act_type not in (?)", ['JournalsForMessage','Message','HomeworkCommon','News','Issue','Journal','Poll'])
+  #   list = query.order("id desc").limit(query_rec_count).all
+  #
+  #   result = [];
+  #   for item in list
+  #     container = get_activity_container(item,type)
+  #     if( activity_is_show(item,container) )
+  #       result << { :item=>item,:e=>container }
+  #     end
+  #   end
+  #   return [lastid,result]
+  # end
+  # def get_activity_container activity,type
+  #   e = nil;
+  #   if type == 'Project'
+  #     if activity.act_type == 'Poll'
+  #       # 项目没有问卷
+  #       # e = Project.find_by_id(activity.act.polls_group_id)
+  #     else
+  #       e = activity.act.project if activity.act.respond_to?('project')
+  #     end
+  #   end
+  #   if type == 'Course'
+  #     if activity.act_type == 'Poll'
+  #       e = Course.find_by_id(activity.act.polls_group_id)
+  #     else
+  #       e = activity.act.course if activity.act.respond_to?('course')
+  #     end
+  #   end
+  #
+  #   return e;
+  # end
+  def query_activities(query)
+    list = query.limit(8).all
+    result = [];
+    for item in list
+      container = get_activity_container(item)
+      result << { :item=>item,:e=>container }
+    end
+    return result
+  end
+  def get_activity_container activity
+    return activity.activity_container
+    # if type == 'Project'
+    #   return activity.act.project if activity.act.respond_to?('project')
+    # end
+    # if type == 'Course'
+    #   if activity.act_type == 'Poll'
+    #     return Course.find_by_id(activity.act.polls_group_id)
+    #   end
+    #   return activity.act.course if activity.act.respond_to?('course')
+    # end
+    # return nil;
+  end
+
+  # def activity_is_show(activity,e)
+  #   if(!e)
+  #     return false
+  #   end
+  #
+  #   if activity.user_id == User.current.id
+  #     return true
+  #   end
+  #   if( e.visible? )
+  #     return true
+  #   end
+  #   return false
+  # end
+  def get_activity_act_showname_htmlclear(activity)
+    str = get_activity_act_showname(activity)
+    str = str.gsub(/<.*>/,'')
+    str = str.gsub(/\r/,'')
+    str = str.gsub(/\n/,'')
+    str = str.lstrip.rstrip
+    if str == ''
+      str = 'RE:'
+    end
+    return str.html_safe
+  end
+  def get_activity_act_showname(activity)
+    case activity.act_type
+      when "HomeworkCommon"
+        return activity.act.name
+      when "Issue"
+        return activity.act.subject
+      when "Journal"
+        arr = details_to_strings(activity.act.details,true)
+        arr << activity.act.notes
+        str = ''
+        arr.each { |item| str = str+item }
+        return str
+      when "JournalsForMessage"
+        return activity.act.notes
+      when "Message"
+        return activity.act.subject
+      when "News"
+        return activity.act.title
+      when "Poll"
+        return activity.act.polls_name
+      when "Contest"
+        return ''
+      when "Contestnotification"
+        return ''
+      when "Principal"
+        return ''
+      else
+        return activity.act_type
+    end
+  end
+  def get_activity_act_createtime(activity)
+    case activity.act_type
+      when "HomeworkCommon"
+        return activity.act.created_at
+      when "Poll"
+        return activity.act.created_at
+      else
+        return activity.act.created_on
+    end
+  end
+  def get_activity_container_url e
+    if !e.visible?
+      return "javascript:;"
+    end
+
+    if e.class.to_s == 'Course'
+      return url_for(:controller => 'courses', :action=>"show", :id=>e.id, :host=>Setting.host_course)
+    end
+    return url_for(:controller => 'projects', :action=>"show", :id=>e.id, :host=>Setting.host_name)
+  end
+  def get_activity_url(activity,e)
+    if !e.visible?
+      return "javascript:;"
+    end
+
+    case activity.act_type
+      # when "Contest"
+      # when "Contestnotification"
+      # when "Principal"
+      when "HomeworkCommon"
+        return homework_common_index_path( :course=>e.id )
+      when "Issue"
+        return issue_path(activity.act.id)
+      when "Journal"
+        return issue_path( activity.act.journalized_id )
+      when "JournalsForMessage"
+        return e.class.to_s == 'Course' ? course_feedback_path(e) : project_feedback_path(e)
+      when "Message"
+        return e.class.to_s == 'Course' ? course_boards_path(e) : project_boards_path(e)
+      when "News"
+        return news_path(activity.act)
+      #return e.class.to_s == 'Course' ? course_news_index_path(e) : project_news_index_path(e)
+      when "Poll"
+        return poll_index_path( :polls_group_id=>activity.act.polls_group_id, :polls_type=>e.class.to_s )
+      else
+        return 'javascript:;'
+    end
+  end
+  def get_activity_opt(activity,e)
+    case activity.act_type
+      when "HomeworkCommon"
+        return '创建了作业'
+      when "News"
+        return e.class.to_s == 'Course' ? '发布了通知' : '添加了新闻'
+      when "Issue"
+        return '发表了问题'
+      when "Journal"
+        return '回复了问题'
+      when "JournalsForMessage"
+        return e.class.to_s == 'Course' ? '发表了留言' : '提交了反馈'
+      #return ( activity.act.reply_id == nil || activity.act.reply_id == 0 ) ? '' : ''
+      when "Message"
+        return ( activity.act.parent_id == nil || activity.act.parent_id == '' ) ? '发布了帖子' : '回复了帖子'
+      when "Poll"
+        return '发布了问卷'
+      else
+        return '有了新动态'
+    end
+  end
+
 end

app/models/activity.rb

@@ -2,9 +2,20 @@ class Activity < ActiveRecord::Base
   attr_accessible :act_id, :act_type, :user_id
   belongs_to :act, :polymorphic => true
   belongs_to :user
+  belongs_to :activity_container, polymorphic: true
   validates :act_id, presence: true
   validates :act_type, presence: true
   validates :user_id, presence: true
 
   include Trustie::Cache::ClearCourseEvent
+
+  before_create :set_container_type_val
+
+  #helper :activities
+  include ActivitiesHelper
+  def set_container_type_val
+    container_type,container_id =get_container_type(self)
+    self.activity_container_type = container_type
+    self.activity_container_id = container_id
+  end
 end

app/models/homework_test.rb

@@ -2,4 +2,5 @@ class HomeworkTest < ActiveRecord::Base
   attr_accessible :input, :output, :homework_common_id
 
   belongs_to :homework_common
+  has_one :student_work_test
 end

app/models/student_work.rb

@@ -7,6 +7,13 @@ class StudentWork < ActiveRecord::Base
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   belongs_to :project
+  has_one :student_work_test
+
+  before_destroy :delete_praise
 
   acts_as_attachable
+
+  def delete_praise
+    PraiseTread.where("praise_tread_object_id = #{self.id} AND praise_tread_object_type = 'StudentWork'").destroy_all
+  end
 end

app/models/student_work_test.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+class StudentWorkTest < ActiveRecord::Base
+  attr_accessible :student_work_id, :homework_test_id
+
+  belongs_to :homework_test
+  belongs_to :student_work
+
+  def status_to_s
+    case self.result
+      when -1
+        '编译出错'
+      when -2
+        '答题错误'
+      when -3
+        '答案错误'
+      when 1
+        '运行出错'
+      when 2
+        '超时'
+      when 3
+        '内存超出'
+      when 4
+        '输出超出'
+      when 5
+        '禁用函数'
+      when 6
+        '其他错误'
+      when 0
+        '成功'
+      else
+        '未知错误'
+    end
+  end
+
+  def test_score
+    if self.result == 0
+      format("%.1f",100.0 / self.student_work.homework_common.homework_tests.count)
+    else
+      0
+    end
+  end
+end

app/models/user_extensions.rb

@@ -12,6 +12,8 @@ class UserExtensions < ActiveRecord::Base
   belongs_to :user
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id
   attr_accessible :user_id,:birthday,:brief_introduction,:gender,:location,:occupation,:work_experience,:zip_code,:identity, :technical_title,:student_id
+  validates_length_of :description, :maximum => 255
+  validates_length_of :brief_introduction, :maximum => 255
   TEACHER = 0
   STUDENT = 1
   ENTERPRISE = 2

app/models/visitor.rb

@@ -0,0 +1,3 @@
+class Visitor < ActiveRecord::Base
+  belongs_to :user
+end

app/views/avatar/upload.js.erb

@@ -1,4 +1,8 @@
+<% if @source_type=='User' %>
+var imgSpan = $("img[nhname='avatar_image']");
+imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'});
+<% else %>
 var imgSpan = jQuery('#avatar_image');
 
 imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'});
-  
+<% end %>

app/views/bids/new_contest.html.erb

@@ -1,10 +1,10 @@
-<!-- huang -->
-<h3><%=l(:label_newtype_contest)%></h3>
+<!--&lt;!&ndash; huang &ndash;&gt;-->
+<!--<h3><%=l(:label_newtype_contest)%></h3>-->
 
-<%= labelled_form_for @bid, :url => {:controller => 'bids', :action => 'create_contest'} do |f| %>
-<div class="box tabular">
-	<%= render :partial => 'form_contest', :locals => { :f => f } %>
-	<%= submit_tag l(:button_create) %>
-	<%= javascript_tag "$('#bid_name').focus();" %>
-	<% end %>
-</div>
+<!--<%= labelled_form_for @bid, :url => {:controller => 'bids', :action => 'create_contest'} do |f| %>-->
+<!--<div class="box tabular">-->
+	<!--<%= render :partial => 'form_contest', :locals => { :f => f } %>-->
+	<!--<%= submit_tag l(:button_create) %>-->
+	<!--<%= javascript_tag "$('#bid_name').focus();" %>-->
+	<!--<% end %>-->
+<!--</div>-->

app/views/courses/_show_member_score.html.erb

@@ -19,7 +19,7 @@
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
       <% @member_score.homework_common_list.each do |homework_common| %>
             <li>
-              <span class="c_grey02 w280">
+              <span class="c_grey02 w280 hiddent">
                 <%= homework_common.name %>
               </span>
               <span class="c_red w70">

app/views/courses/finishcourse.js.erb

@@ -1,8 +1,8 @@
 <% if @save_flag %>
-    $('#finish_course_<%=@course.id%>').replaceWith("<%= escape_javascript(set_course_time(@course_prefs))%>");
+$('#finish_course_<%=@course.id%>').replaceWith("<%= escape_javascript(set_course_time(@course_prefs))%>");
+var html = "<%= escape_javascript( render( :partial => 'users/course_form', :locals => {:item => @course_prefs} ) )%>";
+$('#nh_course_<%=@course.id%>').replaceWith(html);
 //    alert("关闭成功");
 <% else %>
-    alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。');
-<% end  %>
-
-
+alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。');
+<% end  %>

app/views/courses/join_private_courses.js.erb

@@ -1,7 +1,8 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
 showModal('ajax-modal', '540px');
 $('#ajax-modal').css('height','330px');
-$('#ajax-modal').siblings().remove();
+//$('#ajax-modal').siblings().remove();
+$('#ajax-modal').siblings().hide();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
         "<a href='javascript:' onclick='hidden_join_course_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
 $('#ajax-modal').parent().removeClass("alert_praise");