Merge branch 'szzh' into dev_hjq

Conflicts:
	public/stylesheets/new_user.css

app/controllers/account_controller.rb

@@ -41,6 +41,10 @@ class AccountController < ApplicationController
     render :layout => 'static_base'
   end
 
+  def about_us
+    render :layout => 'static_base'
+  end
+
   # Log out current user and redirect to welcome page
   def logout
     if User.current.anonymous?

app/controllers/comments_controller.rb

@@ -34,25 +34,32 @@ class CommentsController < ApplicationController
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT
       end
-      # 与我相关动态的记录add start
-      if( @comment.id && @news.course )
-        if(@news.author_id != User.current.id)
-          notify = ActivityNotify.new()
-          notify.activity_container_id = @news.course.id
-          notify.activity_container_type = 'Course'
-          notify.activity_id = @comment.id
-          notify.activity_type = 'Comment'
-          notify.notify_to = @news.author_id
-          notify.is_read = 0
-          notify.save()
-        end
-      end
-      # 与我相关动态的记录add end
+      # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add start
+      # if( @comment.id && @news.course )
+      #   if(@news.author_id != User.current.id)
+      #     notify = ActivityNotify.new()
+      #     notify.activity_container_id = @news.course.id
+      #     notify.activity_container_type = 'Course'
+      #     notify.activity_id = @comment.id
+      #     notify.activity_type = 'Comment'
+      #     notify.notify_to = @news.author_id
+      #     notify.is_read = 0
+      #     notify.save()
+      #   end
+      # end
+      # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
       flash[:notice] = l(:label_comment_added)
     end
 
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    else
       redirect_to news_url(@news)
     end
+  end
 
   def destroy
     @news.comments.find(params[:comment_id]).destroy

app/controllers/homework_common_controller.rb

@@ -115,23 +115,16 @@ class HomeworkCommonController < ApplicationController
           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)
+        # 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
-
-        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
+        # 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
@@ -254,15 +247,15 @@ class HomeworkCommonController < ApplicationController
         question[:input] << test.input
         question[:output] << test.output
       end
-      uri = URI("http://192.168.80.21:8080/api/questions/#{@homework_detail_programing.question_id}.json")
-      body = question.to_json
-      res = Net::HTTP.new(uri.host, uri.port).start do |client|
-        request                 = Net::HTTP::Put.new(uri.path)
-        request.body            = body
-        request["Content-Type"] = "application/json"
-        client.request(request)
-      end
-      result = JSON.parse(res.body)
+      # uri = URI("http://192.168.80.21:8080/api/questions/#{@homework_detail_programing.question_id}.json")
+      # body = question.to_json
+      # res = Net::HTTP.new(uri.host, uri.port).start do |client|
+      #   request                 = Net::HTTP::Put.new(uri.path)
+      #   request.body            = body
+      #   request["Content-Type"] = "application/json"
+      #   client.request(request)
+      # end
+      # result = JSON.parse(res.body)
     end
 
     @homework.save_attachments(params[:attachments])

app/controllers/issues_controller.rb

@@ -20,11 +20,11 @@ class IssuesController < ApplicationController
   default_search_scope :issues
 
   before_filter :authorize1, :only => [:show]
-  before_filter :find_issue, :only => [:show, :edit, :update]
+  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal]
   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form]
   #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index]
+  before_filter :authorize, :except => [:index,:add_journal]
 
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
@@ -385,6 +385,18 @@ class IssuesController < ApplicationController
     end
   end
 
+  def add_journal
+    jour = Journal.new
+    jour.user_id = User.current.id
+    jour.notes = params[:notes]
+    jour.journalized = @issue
+    jour.save
+    @user_activity_id = params[:user_activity_id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def find_project

app/controllers/messages_controller.rb

@@ -177,6 +177,7 @@ class MessagesController < ApplicationController
     @reply.board = @board
     @reply.safe_attributes = params[:reply]
     @reply.content = @quote + @reply.content
+    @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     @topic.children << @reply
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
@@ -185,41 +186,18 @@ class MessagesController < ApplicationController
         update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE
       end
 
-      # 与我相关动态的记录add start
-      if(@board && @board.course) #项目的先不管
-        notifyto_arr = {}
-        notifyto_arr[@topic.author_id] = @topic.author_id
-        if( params[:parent_topic] != nil && params[:parent_topic] != '')
-          parent_topic = Message.find(params[:parent_topic])
-          notifyto_arr[parent_topic.author_id] = parent_topic.author_id
-        end
-        notifyto_arr.each do |k,user_id|
-          if(user_id != User.current.id)
-            notify = ActivityNotify.new()
-            if(@board.course)
-              notify.activity_container_id = @board.course_id
-              notify.activity_container_type = 'Course'
-            else
-              notify.activity_container_id = @board.project_id
-              notify.activity_container_type = 'Project'
-            end
-            notify.activity_id = @reply.id
-            notify.activity_type = 'Message'
-            notify.notify_to = user_id
-            notify.is_read = 0
-            notify.save()
-          end
-        end
-      end
-      # 与我相关动态的记录add end
-
       call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
       attachments = Attachment.attach_files(@reply, params[:attachments])
       render_attachment_warning_if_needed(@reply)
     else
       #render file: 'messages#show', layout: 'base_courses'
     end
-    if params[:is_board]
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    elsif params[:is_board]
       if @project
         redirect_to project_boards_path(@project)
       elsif @course

app/controllers/student_work_controller.rb

@@ -3,13 +3,45 @@ 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]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test]
   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 program_test
+    resultObj = {status: 0, results: [], error_msg: '', time: Time.now}
+    student_work = find_or_save_student_work
+    unless student_work
+      resultObj[:status] = 100
+    else 
+      if @homework.homework_type == 2 && @homework.homework_detail_programing     
+        result = test_realtime(student_work, params[:src])
+        logger.debug result
+        resultObj[:status] = result["status"]
+        resultObj[:results] = result["results"]
+        resultObj[:error_msg] = result["error_msg"]
+        results = result["results"]
+        if result["status"].to_i == -2 #编译错误
+          results = [result["error_msg"]]
+        end
+        student_work_test = student_work.student_work_tests.build(status: result["status"],  results: results,
+          src: params[:src])
+        unless student_work.save
+          resultObj[:status] = 200
+        else
+          resultObj[:status] = result["status"].to_i
+          resultObj[:time] = student_work_test.created_at.to_s(:db)
+          resultObj[:index] = student_work.student_work_tests.count
+        end
+
+      end
+    end
+    render :json => resultObj
+  end
+
   def index
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages
@@ -102,20 +134,16 @@ class StudentWorkController < ApplicationController
   end
 
   def new
-    student_work = @homework.student_works.where("user_id = ?",User.current.id).first
-    if student_work.nil?
-      @stundet_work = StudentWork.new
-      respond_to do |format|
-        format.html
-      end
-    else
-      render_403
+    @student_work = @homework.student_works.where("user_id = ?",User.current.id).first
+    if @student_work.nil?
+      @student_work = StudentWork.new
     end
   end
 
   def create
     if params[:student_work]
-      stundet_work = StudentWork.new
+      stundet_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
+      stundet_work ||= StudentWork.new
       stundet_work.name = params[:student_work][:name]
       stundet_work.description = params[:student_work][:description]
       stundet_work.project_id = params[:student_work][:project_id]
@@ -128,23 +156,9 @@ 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:@homework.homework_detail_programing.language
-          }
-          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 {
@@ -584,4 +598,44 @@ class StudentWorkController < ApplicationController
     book.write xls_report
     xls_report.string
   end
+
+  def find_or_save_student_work
+    student_work = @homework.student_works.where(user_id: User.current.id).first
+    if student_work.nil?
+      @homework.student_works.build(
+        name: params[:title],
+        description: params[:src],
+        user_id: User.current.id
+        )
+      unless @homework.save
+      else
+        student_work = @homework.student_works.where(user_id: User.current.id).first
+      end
+    end
+    student_work
+  end
+
+
+  def test_realtime(student_work, src)
+    url = "#{Redmine::Configuration['judge_server']}api/realtime_test.json"
+
+    factor = []
+    @homework.homework_tests.each do |test|
+      factor << {input: test.input, output: test.output}
+    end
+    solutions = {
+        src:src,
+        language:@homework.homework_detail_programing.language,
+        factor: factor
+            }
+    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
+    JSON.parse(res.body)
+  end
 end

app/controllers/users_controller.rb

@@ -342,6 +342,24 @@ class UsersController < ApplicationController
     end
   end
 
+  def new_user_commit_homework
+    @user = User.current
+    @homework = HomeworkCommon.find(params[:homework_id])
+    @student_work = @homework.student_works.where(user_id: User.current.id).first
+    if @student_work.nil?
+      @student_work = StudentWork.new
+    end
+    respond_to do |format|
+      format.js
+      format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  def user_commit_homework
+    flash[:notice] = l(:notice_successful_create)
+    redirect_to user_homeworks_user_path(User.current)
+  end
+
   def user_new_homework
     if params[:homework_common]
       homework = HomeworkCommon.new
@@ -349,7 +367,7 @@ class UsersController < ApplicationController
       homework.description = params[:homework_common][:description]
       homework.end_time = params[:homework_common][:end_time] || Time.now
       homework.publish_time = Time.now
-      homework.homework_type = 1
+      homework.homework_type = params[:homework_type].to_i || 1
       homework.late_penalty = 2
       homework.user_id = User.current.id
       homework.course_id = params[:course_id]
@@ -358,6 +376,7 @@ class UsersController < ApplicationController
       render_attachment_warning_if_needed(homework)
 
       #匿评作业相关属性
+      if homework.homework_type == 1
         homework_detail_manual = HomeworkDetailManual.new
         homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6
         homework_detail_manual.comment_status = 1
@@ -366,9 +385,27 @@ class UsersController < ApplicationController
         homework_detail_manual.evaluation_num = params[:evaluation_num] || 3
         homework_detail_manual.absence_penalty = 2
         homework.homework_detail_manual = homework_detail_manual
+      else
+        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.language = params[:program][:language].to_i
+
+        inputs = params[:program][:input]
+        if Array === inputs
+          inputs.each_with_index do |val, i|
+            homework.homework_tests << HomeworkTest.new(
+              input: val,
+              output: params[:program][:output][i]
+            )    
+          end
+        end
+        
+      end
 
       if homework.save
         homework_detail_manual.save if homework_detail_manual
+        homework_detail_programing.save if homework_detail_programing
         redirect_to user_homeworks_user_path(User.current.id)
       end
     end
@@ -376,9 +413,102 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
+    @user = User.current
+    user_course_ids = @user.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    @type = params[:type]
+    @homework_id = params[:homework_id]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #引入资源列表根据类型过滤
+  def user_resource_type
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    if(params[:type].blank? || params[:type] == "1") #全部
       user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
       @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                           "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    elsif params[:type] == "2" #课程资源
+      user_course_ids = User.current.courses.map { |c| c.id}
+      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
+    elsif params[:type] == "4" #附件
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal'").order("created_on desc")
+    end
+    @type = params[:type]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+
+  #引入资源列表根据关键词过滤
+  def user_ref_resource_search
+    search = params[:search].to_s.strip.downcase
+    if(params[:type].blank? || params[:type] == "1") #全部
+      user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
+      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                          " or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "2" #课程资源
+      user_course_ids = User.current.courses.map { |c| c.id}
+      @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "4" #附件
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+    end
+    @type = params[:type]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #将资源批量引入
+  def import_resources_to_homework
+    @attachments = []
+    unless  params[:checkbox1].nil? || params[:checkbox1].blank?
+      params[:checkbox1].each do  |id|
+        atta = Attachment.find(id)
+        att_copy = atta.copy
+        att_copy.container_id = nil
+        att_copy.container_type = nil
+        att_copy.copy_from = atta.id
+        att_copy.save
+        @attachments << att_copy
+      end
+    end
     respond_to do |format|
       format.js
     end
@@ -631,9 +761,7 @@ class UsersController < ApplicationController
   end
 
   def show
-
     @page = params[:page] ? params[:page].to_i + 1 : 0
-
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
     course_types = "('Message','News','HomeworkCommon','poll')"
@@ -978,7 +1106,7 @@ class UsersController < ApplicationController
     #@user.save_attachments(params[:attachments],User.current)
     # Container_type为Principal
     Attachment.attach_filesex(@user, params[:attachments], params[:attachment_type])
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank?|| params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
         @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -1040,7 +1168,7 @@ class UsersController < ApplicationController
       end
     end
 
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
         @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -1179,6 +1307,18 @@ class UsersController < ApplicationController
     else
       @flag = false
     end
+    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    @type = params[:type]
+    @limit = 25
+    @user = User.current
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end
@@ -1235,7 +1375,18 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
-
+    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    @type = params[:type]
+    @limit = 25
+    @user = User.current
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end
@@ -1450,7 +1601,7 @@ class UsersController < ApplicationController
       render_403
       return
     end
-    if(params[:type].nil? || params[:type] == "1") #全部
+    if(params[:type].blank? || params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
         @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+

app/helpers/application_helper.rb

@@ -2338,7 +2338,7 @@ module ApplicationHelper
   #根据传入作业确定显示为编辑作品还是新建作品,或者显示作品数量
   def user_for_homework_common homework,is_teacher
     if is_teacher #老师显示作品数量
-      link_to "提交（#{homework.student_works.count}）",student_work_index_path(:homework => homework.id),:class => "c_blue"
+      link_to "提交(#{homework.student_works.count})",student_work_index_path(:homework => homework.id),:class => "c_blue"
     else #学生显示提交作品、修改作品等按钮
       work = cur_user_works_for_homework homework
       if work.nil?

app/helpers/journals_helper.rb

@@ -116,7 +116,7 @@ module JournalsHelper
       end
     end
     #content << content_tag('div', links.join(' ').html_safe, :class => 'contextual', :style => 'margin-top:-25px;') unless links.empty?
-    content << textilizable(journal, :notes)
+    content << textAreailizable(journal, :notes)
     css_classes = "wiki"
     css_classes << " editable" if editable
     content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px")

app/helpers/users_helper.rb

@@ -544,9 +544,13 @@ module UsersHelper
   #获取指定用户作为老师的课程
   def get_as_teacher_courses user
     type = []
+    option = []
+    option << "请选择发布作业的课程"
+    option << -1
+    type << option
     user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
-      option << course.name
+      option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id
       type << option
     end

app/models/homework_common.rb

@@ -56,4 +56,6 @@ class HomeworkCommon < ActiveRecord::Base
     Mailer.run.homework_added(self)
   end
 
+  delegate :language_name, :to => :homework_detail_programing
+
 end

app/models/homework_detail_programing.rb

@@ -2,4 +2,8 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   attr_accessible :language, :standard_code, :homework_common_id
 
   belongs_to :homework_common
+
+  def language_name
+    %W(c c++).at(self.language.to_i - 1)
+  end
 end

app/models/homework_test.rb

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

app/models/student_work.rb

@@ -7,7 +7,7 @@ class StudentWork < ActiveRecord::Base
   has_many :student_works_evaluation_distributions, :dependent => :destroy
   has_many :student_works_scores, :dependent => :destroy
   belongs_to :project
-  has_many :student_work_test
+  has_many :student_work_tests, order: 'id desc'
 
   before_destroy :delete_praise
 

app/models/student_work_test.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 class StudentWorkTest < ActiveRecord::Base
-  attr_accessible :student_work_id, :homework_test_id, :result, :error_msg
-
-  belongs_to :homework_test
+  attr_accessible :student_work_id, :results, :status, :src
   belongs_to :student_work
 
+  serialize :results, Array
+
   def status_to_s
-    case self.result.to_i
+    case self.status.to_i
       when -1
         '编译出错'
       when -2
@@ -33,10 +33,11 @@ class StudentWorkTest < ActiveRecord::Base
   end
 
   def test_score
-    if self.result.to_i == 0
+    if self.status.to_i == 0
       format("%.1f",100.0 / self.student_work.homework_common.homework_tests.count)
     else
       0
     end
   end
+
 end

app/views/account/about_us.html.erb

@@ -0,0 +1,50 @@
+<%= stylesheet_link_tag 'new_user'%>
+<div class="homepageContent BgBox">
+  <h2 class="BgBox_h2">关于我们</h2>
+  <div class="AgreementBox">
+    <p class="AgreementTxt">
+      Trustie是一个面向高校创新实践的在线协作社区，是在中国高校推行大规模开放在线研究（Massive Open Online Research, MOORE）的支撑平台，也简称Trustie平台。老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。
+    </p>
+    <p class="AgreementTxt">
+      MOORE是国防科学技术大学杨学军院士提出的一个面向高校科研教学活动的新型创新实践概念，为全面支持高校人才培养和科学研究提供了一种新思路。MOORE是对大规模在线开放课程（Massive Open Online Course, MOOC）的拓展，是课堂教学与创新实践深度结合的全新模式，可以看作MOOC2.0。
+    </p>
+    <p class="AgreementTxt">
+      2005年开始，Trustie研制团队围绕网络时代的软件开发效率和质量这一核心问题展开研究，经过十年的磨砺与攻关，逐步揭示出以大众化协同开发、开放式资源共享、持续性可信评估为核心的互联网大规模协同机理，提出了全新的软件开发群体化方法。2008年起，研制团队开始探索如何将这种协同机理引入软件人才培养。MOORE概念的提出为研制团队的人才培养实践提供了新的发展方向和应用模式，使Trustie技术和工具能够更直接、更有效地与高校人才培养对接，形成了今天已被大量师生接受的在线人才培养平台。
+    </p>
+    <p class="AgreementTxt">
+      研制团队认为MOORE的创新人才培养模式（如图1左图）是将互联网大规模协同机理与高校创新实践活动相结合的全新人才培养方法和模式，研制团队并基于本平台的架构形成了对MOORE核心机理的三方面认识（如图1右图）。
+    </p>
+    <div class="AgreementImg" >
+      <img src="images/aboutus_01.jpg" width="820" height="285" />
+      <p class="AgreementTxt T_C fb mt10">图1 基于MOORE的创新人才培养模式与核心机理</p>
+    </div>
+    <p class="AgreementTxt">
+      目前，Trustie平台已经初步展现出大规模开放在线研究的生态系统蓝图，其核心是在线教学实践平台和在线协同研究平台，如图2。Trustie在线教学实践平台是支持教师和学生围绕课堂学习开展实践的平台（如图2），Trustie在线协同研究平台是支持开发小组围绕实践任务或研究工作开展分布式协作的平台（如图2）。两个核心平台为一名"新手"大学生成长为具有一定创新能力的"创客"提供了从学习到研究的一个渐进式成长环境（如图2）。
+    </p>
+    <p class="AgreementTxt">
+      特别是，根据师生的实际需要，Trustie平台提供了私有模式和公开模式，支持针对未公开成果实施有效知识产权保护为前提的交流分享（如图2）。随着越来越多的高校、课程和研究小组的加入，MOORE创新实践模式的生态效益将不断显现出来。
+    </p>
+    <div class="AgreementImg" >
+      <img src="images/aboutus_02.jpg" width="756" height="496" />
+      <p class="AgreementTxt T_C fb mt10">图2 基于MOORE的支撑平台和生态系统</p>
+    </div>
+    <p class="AgreementTxt">
+      研制团队特别感谢高校老师和学生的积极反馈、无私创意。平台的很多实用便捷的功能都是老师们积极参与和设计的结果，汇聚了大量师生的宝贵贡献，是研制团队和用户群体共同成长的结果。
+    </p>
+    <p class="AgreementTxt">
+      Trustie平台的基本思路是将开源模式与中国高校人才培养活动相结合，但其本质上是一种O2O（Online To Offline）的创新人才培养模式，只有在以下两个方面同步推进，才能在持续解决实际需求的过程中快速发展：<br />
+      &nbsp;&nbsp;&nbsp;&nbsp;（1）构建实践平台，激活创新能力：成为支持不同规模的团队进行协同研究和协同开发的实践平台，支持各类可公开的课程实验任务、教研室科研任务的在线协同，能够有效提升和评估学生的创新能力、协作能力和实践能力。<br />
+      &nbsp;&nbsp;&nbsp;&nbsp;（2）引入开源理念，形成创客文化：将互联网开源软件运动中的自由、对等、共享、创新的理念引入高校，使"自主创意并亲自动手实现创意"的创客精神深入人才培养活动，在学生群体中形成大胆创意、大胆实践的创新文化。
+    </p>
+    <p class="AgreementTxt">
+      研制团队认为，Trustie平台是一种"互联网+"思维在高校教育领域的大型探索性实践。作为一种互联网应用，Trustie平台自身的开发也采取了互联网模式：Trustie研制团队采用了"网构化软件开发模式"，坚持"每周一更"的快速上线、快速体验模式，以最大程度上贴近用户实际需求提升。欢迎高校师生一同投身创新实践，共同见证MOORE创新生态的早日形成。
+    </p>
+  </div>
+
+
+
+</div><!---BgBox end--->
+
+<div class="footer"></div>
+
+

app/views/account/lost_password.html.erb

@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag 'new_user'%>
 
-<div class="homepageContentContainer " style="margin-top:20px;">
+<div class="homepageContentContainer ">
   <div class="homepageContent BgBox">
   	<h2 class="BgBox_h2">忘记密码</h2>
     <div class="BgBoxCon">
@@ -9,7 +9,7 @@
     	 <!--<input type="text"  class="NomalInput mb20 " value="请输入登录邮箱地址"  />-->
           <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱',:class=>'NomalInput mb20'%>
           <% if  flash[:error] %>
-              <p class="c_red mb5"><%=  flash[:error]%></p>
+              <p class="c_red mt-20 ml5"><%=  flash[:error]%></p>
               <!--<div style="color: red" class="mb5" ><%#=  flash[:error]%></div>-->
           <% elsif  flash[:notice] %>
               <p class="c_green mb5"><%=  flash[:notice]%></p>

app/views/boards/_course_show.html.erb

@@ -37,7 +37,7 @@
     <% @topics.each do |topic| %>
         <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;" id="topic<%= topic.id %>" nhname="container_board" mhname="container_board_reply">
           <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
-          <div class="talkmain_txt fl mt5 f14">
+          <div class="talkmain_txt fl mt5 f12">
             <% author = topic.author.to_s %>
             <div style="max-width:120px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">
               <%= link_to User.current.member_of_course?(@board.course) ? "#{topic.author.show_name}(#{topic.author.login})" : "#{topic.author}" , user_path(topic.author),
@@ -48,7 +48,7 @@
 
             <p class="talkmain_tit fl fb break_word f14" title="<%=  h(topic.subject) %>" style="width:auto;float:left;max-width:360px;white-space:nowrap;overflow:hidden;float:left;text-overflow:ellipsis;">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
             <% if topic.course_editable_by?(User.current) %>
-                <a href="javascript:void(0)" nhname="showbtn"  style="color: #426e9a;float: right;
+                <a href="javascript:void(0)" nhname="showbtn" class="linkBlue"  style="float: right;
                         margin-right: 10px;"><%= l(:button_edit) %></a>
             <% end %>
 
@@ -120,7 +120,7 @@
             <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
 
           </div>
-          <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr f14" style="margin-right:10px;"><%= l(:button_reply) %></a>
+          <a href="javascript:void(0)" nhname="showbtn_reply" class="linkBlue fr f12" style="margin-right:10px;"><%= l(:button_reply) %></a>
 
           <div class="cl"></div>
 
@@ -171,7 +171,7 @@
                             </div>
                             <input nhname="nh_content_val" value="<%= message.content %>" type="hidden"/>
                             <br/><div class="cl"></div>
-                            <span class=" c_grey fl f14"><%= format_time(message.created_on) %></span>
+                            <span class=" c_grey fl f12"><%= format_time(message.created_on) %></span>
                             <%= link_to(
 
                                         l(:button_delete),
@@ -179,13 +179,13 @@
                                         :method => :post,
                                         :data => {:confirm => l(:text_are_you_sure)},
                                         :title => l(:button_delete),
-                                        :class => ' c_dblue fr f14'
+                                        :class => ' linkBlue fr f12'
                                 ) if message.course_destroyable_by?(User.current) %>
                             <%= link_to(
                                         l(:button_reply),
                                         'javascript:;',
                                         :nhname =>'showbtn_child_reply',
-                                        :class => ' c_dblue fr f14',
+                                        :class => ' linkBlue fr f12',
                                         :style => 'margin-right: 10px;',
                                         'data-topic-id' =>message.id,
                                         :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>

app/views/comments/create.js.erb

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

app/views/courses/search.html.erb

@@ -20,12 +20,12 @@
                 <% end %>
             <% end %>
             </td>
-            <td rowspan="2" >
+            <!--<td rowspan="2" >
               <div class="project-search" style="float: right">
-                <%= text_field_tag 'name', params[:name], :size => 30 %>
-                <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                <%#= text_field_tag 'name', params[:name], :size => 30 %>
+                <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
               </div>
-            </td>
+            </td>-->
             </tr>
         <tr>
           <td >

app/views/homework_common/_new_homework_detail_manual_form.html.erb

@@ -0,0 +1,74 @@
+<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/new.html.erb

@@ -1,17 +1,16 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<% content_for :header_tags do %>
+  <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+  <%= javascript_include_tag 'homework','baiduTemplate' %>
+<% end %>
+
 <%= 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'%>
+      <%= render :partial => 'homework_common/new_homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
   <% end%>
 </div><!--hwork_new end-->
+
+
 <div class="cl"></div>

app/views/homework_common/next_step.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= error_messages_for 'homework_common' %>
 <div class="project_r_h">
   <h2 class="project_h2">

app/views/issues/add_journal.js.erb

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

app/views/layouts/_footer.html.erb

@@ -1,9 +1,9 @@
-<div id="Footer">
+<div id="Footer" class="f12">
   <div class="footerAboutContainer">
     <ul class="footerAbout">
-      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_about_us)%></span>|</li>
-      <li class="fl"><a href="http://forge.trustie.net/projects/2/member" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
-      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
+      <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
       <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
       <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_forums)%></span></li>