Merge branch 'develop' into ouyang

Conflicts:
	app/views/words/create_reply.js.erb

app/controllers/at_controller.rb

@@ -34,6 +34,12 @@ class AtController < ApplicationController
         find_homework(id)
       when 'Topic'
         find_topic(id)
+      when 'JournalsForMessage'
+        find_journals_for_message(id)
+      when 'Principal'
+        find_principal(id)
+      when 'All'
+        nil
       else
         nil
     end
@@ -120,7 +126,11 @@ class AtController < ApplicationController
   #JournalsForMessage
   def find_journals_for_message(id)
     jounrnal = JournalsForMessage.find(id)
-    find_at_users(jounrnal.jour_type, jounrnal.jour_id)
+    if jounrnal.jour_type == 'Principal'
+      [jounrnal.user]  + (JournalsForMessage.where(m_reply_id: id).map(&:user) || [])
+    else
+      find_at_users(jounrnal.jour_type, jounrnal.jour_id)
+    end
   end
 
   #Poll
@@ -129,8 +139,6 @@ class AtController < ApplicationController
 
   #Journal
   def find_journal(id)
-    journal = Journal.find(id)
-    find_at_users(journal.journalized_type, journal.journalized_id)
   end
 
   #Document
@@ -145,7 +153,6 @@ class AtController < ApplicationController
 
   #Principal
   def find_principal(id)
-
   end
 
   #BlogComment

app/controllers/courses_controller.rb

@@ -321,11 +321,12 @@ class CoursesController < ApplicationController
 
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
+    @homeworks = @course.homework_commons.order("created_at desc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
 
     respond_to do |format|
       format.xls {
-        send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
+        send_data(member_to_xls(@homeworks,@course,@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
                   :filename => filename_for_content_disposition("#{filename}.xls"))
       }
     end
@@ -441,7 +442,10 @@ class CoursesController < ApplicationController
     @course = cs.create_course(params,User.current)[:course]
     if params[:copy_course]
       copy_course = Course.find params[:copy_course].to_i
-      @course.update_attributes(:open_student => copy_course.open_student, :publish_resource => copy_course.publish_resource)
+      @course.is_copy = 1
+      @course.open_student = copy_course.open_student
+      @course.publish_resource = copy_course.publish_resource
+      @course.save
       if params[:checkAll]
         attachments = copy_course.attachments
         attachments.each do |attachment|
@@ -903,6 +907,17 @@ class CoursesController < ApplicationController
       return 404
     end
   end
+  #搜索作业
+  def homework_search
+    @search = "%#{params[:search].strip.downcase}%"
+    @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    if @is_teacher
+      @homeworks = @course.homework_commons.where("name like '%#{@search}%'").order("created_at desc").limit(10).offset(@page * 10)
+    else
+      @homeworks = @course.homework_commons.where("name like '%#{@search}%' and publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+    end
+  end
 
   private
   def update_quotes attachment
@@ -960,7 +975,7 @@ class CoursesController < ApplicationController
     sql_select = ""
     if groupid == 0
       sql_select = "SELECT members.*,(
-          SELECT SUM(student_works.final_score)
+          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
@@ -972,7 +987,7 @@ class CoursesController < ApplicationController
         WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
-          SELECT SUM(student_works.final_score)
+          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
@@ -1006,16 +1021,54 @@ class CoursesController < ApplicationController
 
   end
 
-  def member_to_xls members,groups
+  def member_to_xls homeworks, course, members,groups
     xls_report = StringIO.new
     book = Spreadsheet::Workbook.new
     sheet1 = book.create_worksheet :name => "student"
-
     blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10
-    sheet1.row(0).default_format = blue
+    #sheet1.row(0).default_format = blue
+    #sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_class),l(:excel_f_score),l(:excel_commit_time)])
+    sheet1[0,0] = "课程编号"
+    sheet1[0,1] = course.id
+    sheet1[1,0] = "课程学期"
+    sheet1[1,1] = course.time.to_s+"年"+course.term
+    sheet1[2,0] = "课程名称"
+    sheet1[2,1] = course.name
+    sheet1[3,0] = "教师团队"
+    sheet1[3,1] = (searchTeacherAndAssistant course).map{|member| member.user.show_name}.join('、')
+    sheet1[4,0] = "主讲教师"
+    sheet1[4,1] = course.teacher.show_name
+    sheet1[5,0] = "排名"
+    sheet1[5,1] = "学生姓名"
+    sheet1[5,2] = "昵称"
+    sheet1[5,3] = "学号"
+    for i in 0 ... homeworks.count
+      sheet1[5,i+4] = "第"+(i+1).to_s+"次"
+    end
+    sheet1[5,homeworks.count+4] = "总成绩"
+    sheet1[5,0] = "排名"
+    sheet1[5,0] = "排名"
+    count_row = 6
+    members.each_with_index do |member, i|
+      sheet1[count_row,0]= i+1
+      sheet1[count_row,1] = member.user.lastname.to_s + member.user.firstname.to_s
+      sheet1[count_row,2] = member.user.login
+      sheet1[count_row,3] = member.user.user_extensions.student_id
+      homeworks.each_with_index do |homework, j|
+        student_works = homework.student_works.where("user_id = #{member.user.id}")
+        if student_works.empty?
+          sheet1[count_row,j+4] = format("%0.2f",0)
+        else
+          final_score = student_works.first.final_score.nil? ? 0 : student_works.first.final_score
+          score = final_score - student_works.first.absence_penalty - student_works.first.late_penalty
+          sheet1[count_row,j+4] = format("%0.2f",score <0 ? 0:score)
+        end
+      end
+      sheet1[count_row,homeworks.count+4] = format("%0.2f",member.score.nil? ? 0:member.score.to_s)
+      count_row += 1
+    end
 
-    sheet1.row(0).concat([l(:excel_user_id),l(:excel_user_name),l(:excel_nickname),l(:excel_student_id),l(:excel_mail),l(:excel_homework_score)])
-    count_row = 1
+=begin
     group0 = CourseGroup.new();
     group0.id = 0;
     group0.name = l(:excel_member_with_out_class)
@@ -1037,6 +1090,7 @@ class CoursesController < ApplicationController
         end
       end
     end
+=end
     book.write xls_report
     xls_report.string
   end

app/controllers/homework_common_controller.rb

@@ -15,8 +15,12 @@ class HomeworkCommonController < ApplicationController
     @new_homework.homework_detail_manual = HomeworkDetailManual.new
     @new_homework.course = @course
     @page = params[:page] ? params[:page].to_i + 1 : 0
-    @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
+    if @is_teacher
+      @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
+    else
+      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+    end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
 
@@ -340,7 +344,7 @@ class HomeworkCommonController < ApplicationController
 
   #当前用户是不是课程的成员
   def member_of_course
-    render_403 unless @course.is_public || User.current.member_of_course?(@course) || User.current.admin?
+    render_403 unless @course.is_public==1 || User.current.member_of_course?(@course) || User.current.admin?
   end
 
   def get_assigned_homeworks(student_works, n, index)

app/controllers/users_controller.rb

@@ -192,11 +192,13 @@ class UsersController < ApplicationController
     forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
     user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
     forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
+    org_querys = OrgMessage.where("user_id=? and viewed=0", user)
     if User.current.id == @user.id
       course_querys.update_all(:viewed => true)
       forge_querys.update_all(:viewed => true)
       user_querys.update_all(:viewed => true)
       forum_querys.update_all(:viewed => true)
+      org_querys.update_all(:viewed => true)
     end
   end
 
@@ -403,8 +405,47 @@ class UsersController < ApplicationController
 
   #导入作业
   def user_import_homeworks
+    @user = User.current
     @select_course = params[:select_course] ? 1 : 0
-    @user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
+    #@user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
+    visible_course = Course.where("is_public = 1 && is_delete = 0")
+    visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
+    @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+    @type = params[:type]
+    @limit = 15
+    @is_remote = true
+    @hw_count = @homeworks.count
+    @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
+    @offset ||= @hw_pages.offset
+    @homeworks = paginateHelper @homeworks,15
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def user_homework_type
+    @user = User.current
+    if(params[:type].blank? || params[:type] == "1") #公共题库
+      visible_course = Course.where("is_public = 1 && is_delete = 0")
+      visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("created_at desc")
+    elsif params[:type] == "2" #我的题库
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
+    end
+    @type = params[:type]
+    @limit = 15
+    @is_remote = true
+    @hw_count = @homeworks.count
+    @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
+    @offset ||= @hw_pages.offset
+    @homeworks = paginateHelper @homeworks,15
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def show_homework_detail
+    @homework = HomeworkCommon.find params[:homework].to_i
     respond_to do |format|
       format.js
     end
@@ -412,7 +453,22 @@ class UsersController < ApplicationController
 
   #用户主页过滤作业
   def user_search_homeworks
-    @user_homeworks = HomeworkCommon.where("user_id = '#{@user.id}' and lower(name) like '%#{params[:name].to_s.downcase}%'").order("created_at desc")
+    @user = User.current
+    search = params[:name].to_s.strip.downcase
+    if(params[:type].blank? || params[:type] == "1") #全部
+      visible_course = Course.where("is_public = 1 && is_delete = 0")
+      visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
+      @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'} and (name like '%#{search}%')").order("created_at desc")
+    elsif params[:type] == "2" #课程资源
+      @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("created_at desc")
+    end
+    @type = params[:type]
+    @limit = 15
+    @is_remote = true
+    @hw_count = @homeworks.count
+    @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
+    @offset ||= @hw_pages.offset
+    @homeworks = paginateHelper @homeworks,15
     respond_to do |format|
       format.js
     end
@@ -426,6 +482,7 @@ class UsersController < ApplicationController
     @homework = HomeworkCommon.new
     @select_course = params[:select_course] || 0
     if homework
+      @ref_homework = homework
       @homework.name = homework.name
       @homework.description = homework.description
       @homework.end_time = homework.end_time
@@ -583,13 +640,15 @@ class UsersController < ApplicationController
           homework_detail_manual.save if homework_detail_manual
           homework_detail_programing.save if homework_detail_programing
           homework_detail_group.save if homework_detail_group
-
+          if params[:quotes] && !params[:quotes].blank?
+            homework = HomeworkCommon.find params[:quotes].to_i
+            homework.update_attribute(:quotes, homework.quotes+1)
+          end
           if params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => homework.course_id)
           else
             redirect_to user_homeworks_user_path(User.current.id)
           end
-
         end
       end
     else
@@ -755,23 +814,17 @@ class UsersController < ApplicationController
     if params[:type].present?
       case params[:type]
         when "public"
-          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 0').order('created_on DESC')
-          @jour_count = jours.count
-          @jour = jours.limit(10).offset(@page * 10)
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 0').order('updated_on DESC')
         when "private"
-          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 1').order('created_on DESC')
-          @jour_count = jours.count
-          @jour = jours.limit(10).offset(@page * 10)
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 1').order('updated_on DESC')
         else
-          jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-          @jour_count = jours.count
-          @jour = jours.limit(10).offset(@page * 10)
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('updated_on DESC')
       end
     else
-      jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-      @jour_count = jours.count
-      @jour = jours.limit(10).offset(@page * 10)
+      jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('updated_on DESC')
     end
+    @jour_count = jours.count
+    @jour = jours.limit(10).offset(@page * 10)
     @type = params[:type]
     if User.current == @user
       jours.update_all(:is_readed => true, :status => false)
@@ -1633,6 +1686,10 @@ class UsersController < ApplicationController
             attach_copied_obj.attachtype = 1
           end
           attach_copied_obj.save
+          unless Project.find(project_id).project_score.nil?
+            Project.find(project_id).project_score.update_attribute(:attach_num,
+                                                                    Project.find(project_id).project_score.attach_num + 1)
+          end
         end
       end
     elsif params[:send_ids].present?
@@ -1668,6 +1725,9 @@ class UsersController < ApplicationController
               attach_copied_obj.attachtype = 1
             end
             attach_copied_obj.save
+            unless Project.find(project_id).project_score.nil?
+              Project.find(project_id).project_score.update_attribute(:attach_num, Project.find(project_id).project_score.attach_num + 1)
+            end
           end
         end
       end

app/controllers/words_controller.rb

@@ -62,6 +62,7 @@ class WordsController < ApplicationController
       update_forge_activity('JournalsForMessage',parent_id)
       update_org_activity('JournalsForMessage',parent_id)
       update_principal_activity('JournalsForMessage',parent_id)
+      (JournalsForMessage.find parent_id).update_attribute(:updated_on,Time.now)
     end
     respond_to do |format|
       # format.html {
@@ -73,7 +74,6 @@ class WordsController < ApplicationController
       #   render 'test/index'
       # }
       format.js {
-        @reply_type = params[:reply_type]
         @user_activity_id = params[:user_activity_id]
         @activity = JournalsForMessage.find(parent_id)
         @is_activity = params[:is_activity]
@@ -95,6 +95,9 @@ class WordsController < ApplicationController
         @user = User.find(@journal_destroyed.jour_id)
         @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
         @is_user = true
+        @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
+        @is_activity = params[:is_activity].to_i if params[:is_activity]
+        @activity = @journal_destroyed.parent if @journal_destroyed.parent
       elsif @journal_destroyed.jour_type == 'HomeworkCommon'
         @homework = HomeworkCommon.find @journal_destroyed.jour_id
         if params[:user_activity_id]

app/helpers/application_helper.rb

@@ -51,7 +51,7 @@ module ApplicationHelper
 
   def link_to_user_version(version, options = {})
     return '' unless version && version.is_a?(Version)
-    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => " f16 fb c_dblue "
+    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => "linkBlue"
   end
 
   # 判断课程是否为精品课程

app/helpers/courses_helper.rb

@@ -697,17 +697,16 @@ module CoursesHelper
   def join_in_course_header(course, user, options=[])
     if user.logged?
       joined = course.members.map{|member| member.user_id}.include? user.id
-      text = joined ? ("<em class='pr_arrow'></em>".html_safe + l(:label_course_exit_student)) : ("<em class='pr_add'></em>".html_safe + l(:label_course_join_student))
+      text = joined ? l(:label_course_exit_student) : l(:label_course_join_student)
       url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id)
       method = joined ? 'delete' : 'post'
       if joined
-        link = "<span class='pr_join_span mr5' ><em class='pr_add'></em>#{l(:label_course_join_student)}</span>" + link_to(text, url, :remote => true, :method => method, :class => "pr_join_a", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
+        link = link_to(text, url, :remote => true, :method => method, :class => "pr_join_a", :id => "#{course.id}", :confirm => l(:text_are_you_sure_out))
       else
-        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "pr_join_a") + "<span class='pr_join_span  mr5' ><em class='pr_arrow'></em>#{l(:label_course_exit_student)}</span>".html_safe
+        link = link_to(text, url, :remote => true, :method => method, :id => "#{course.id}", :class => "pr_join_a")
       end
     else
-      link = "<span class='pr_join_span  mr5' ><em class='pr_add'></em>#{l(:label_course_join_student)}</span>" +
-      "<span class='pr_join_span  mr5' ><em class='pr_arrow'></em>#{l(:label_course_exit_student)}</span>"
+      link = "<span class='pr_join_span  mr5' >#{l(:label_course_join_student)}</span>"
     end
     link.html_safe
   end
@@ -796,7 +795,7 @@ module CoursesHelper
   # 学生按作业总分排序，取前8个
   def hero_homework_score(course, score_sort_by)
     sql_select = "SELECT members.*,(
-          SELECT SUM(student_works.final_score)
+          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{course.id}

app/helpers/users_helper.rb

@@ -89,10 +89,11 @@ module UsersHelper
   def unviewed_message(user)
     course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count
     forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
+    org_count = OrgMessage.where("user_id =? and viewed =?", user, 0).count
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
     user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
     at_count = user.at_messages.where(viewed: false).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count + org_count
   end
 
   def user_mail_notification_options(user)

app/models/at_message.rb

@@ -47,7 +47,11 @@ class AtMessage < ActiveRecord::Base
           "回复帖子: "
         end +  at_message.subject
       when 'JournalsForMessage'
-        "作业: #{at_message.jour.name} 中留言"
+        if at_message.jour_type == 'Principal'
+          "留言: 在#{at_message.at_user.show_name}主页中留言"
+        else
+          "作业: #{at_message.jour.name} 中留言"
+        end
       else
         logger.error "error type: #{at_message_type}"
     end
@@ -92,7 +96,12 @@ class AtMessage < ActiveRecord::Base
       when 'Message'
         {controller: :boards, action: :show, project_id: at_message.board.project, id: at_message.board}
       when 'JournalsForMessage'
-        {controller: :homework_common, action: :index, course: at_message.jour.course_id}
+        if at_message.jour_type == 'Principal'
+          {controller: :users, action: :user_messages, id: at_message.at_user}
+        else
+          {controller: :homework_common, action: :index, course: at_message.jour.course_id}
+        end
+
       else
         logger.error "error type: #{at_message_type}"
     end

app/models/journals_for_message.rb

@@ -70,7 +70,7 @@ class JournalsForMessage < ActiveRecord::Base
   validates :notes, presence: true, if: :is_homework_jour?
   after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_at_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
   after_create :reset_counters!
-  after_update :update_ativity
+  #after_update :update_activity
   after_destroy :reset_counters!
   after_save :be_user_score
   after_destroy :down_user_score

app/models/member.rb

@@ -150,7 +150,7 @@ class Member < ActiveRecord::Base
 
   #当前学生在指定作业内的得分
   def homework_common_score homework_common
-    StudentWork.select("final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+    StudentWork.select("IF(final_score is null,null,final_score - absence_penalty - late_penalty) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
   end
 
   def student_work_score_avg
@@ -158,7 +158,12 @@ class Member < ActiveRecord::Base
   end
 
   def student_work_score_sum
-    StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").sum(:final_score).try(:round, 2).to_f
+    sql_select = "SELECT (SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))) as score
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{self.course_id}
+          AND student_works.user_id = #{self.user_id}"
+    score = StudentWork.find_by_sql(sql_select)
   end
 
   protected

app/models/user.rb

@@ -345,7 +345,8 @@ class User < Principal
     user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count
     at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count
+    org_count = OrgMessage.where("user_id=? and viewed =? and created_at >?", User.current.id,0, User.current.onclick_time.onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count
   end
 
   # 查询指派给我的缺陷记录

app/views/courses/_show_member_score.html.erb

@@ -28,7 +28,7 @@
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= @member_score.student_work_score_sum %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= (@member_score.student_work_score_sum).first.score %></span></li>
     </ul>
 
   </div>

app/views/courses/_user_homework_search_list.html.erb

@@ -0,0 +1,46 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
+<% end %>
+
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url("/images/public_icon.png")}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<div id="user_homework_list">
+  <% homework_commons.each do |homework_common|%>
+      <script type="text/javascript">
+          $(function() {
+              init_activity_KindEditor_data(<%= homework_common.id%>, null, "87%", "<%=homework_common.class.to_s%>");
+          });
+
+          function expand_reply(container,btnid){
+              var target = $(container);
+              var btn = $(btnid);
+              if(btn.data('init')=='0'){
+                  btn.data('init',1);
+                  btn.html('收起回复');
+                  target.show();
+              }else{
+                  btn.data('init',0);
+                  btn.html('展开更多');
+                  target.hide();
+                  target.eq(0).show();
+                  target.eq(1).show();
+                  target.eq(2).show();
+              }
+          }
+      </script>
+      <%= render :partial => 'users/user_homework_detail', :locals => {:homework_common => homework_common,:is_in_course => is_in_course} %>
+  <% end%>
+  <% if homework_commons.count == 10%>
+      <%= link_to "点击展开更多",homework_search_course_path(course_id,:page => page,:search=>search),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
+  <% end%>
+</div>

app/views/courses/homework_search.js.erb

@@ -0,0 +1,5 @@
+<% if @page == 0 %>
+    $("#user_homework_list").replaceWith("<%= escape_javascript( render :partial =>  'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id,:search=>@search} )%>");
+<% else %>
+    $("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id,:search=>@search} )%>");
+<% end %>

app/views/homework_common/_homework_search_form.html.erb

@@ -0,0 +1,6 @@
+<%= form_tag( url_for(:controller => 'courses',:action => 'homework_search',:id=>course.id),
+              :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
+    <input type="text" name="search" placeholder="输入作业名称进行搜索" class="searchResource" />
+    <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
+    <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
+<% end %>

app/views/homework_common/index.html.erb

@@ -36,6 +36,9 @@
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner mb10">
     <div class="NewsBannerName">作业</div>
+    <div id="search_div" class="fr mr10">
+      <%= render :partial =>  'homework_search_form',:locals => {:course=>@course} %>
+    </div>
   </div>
   <div class="cl"></div>
 
@@ -50,8 +53,8 @@
         <% end%>
       </div><!----HomeWork end-->
   <% end%>
-
   <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homeworks,:page => 0,:is_in_course => 1,:course_id => @course.id} %>
+
 </div>
 <div class="cl"></div>
 

app/views/layouts/_project_info.html.erb

@@ -9,13 +9,16 @@
 <!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>-->
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
-<div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %>
+<div class="pr_info_id fl mb5 f14">ID:<%= @course.id%><%= @course.is_public == 0 ? "（私有）" : "（公开）" %>
   <% if is_excellent_course(@course) %>
     <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
   <% end %>
 </div>
 <div class="pr_info_id fl f14">
-ID:<%= @course.id%>
+  <% unless is_teacher %>
+    <!--<a href="" class="pr_join_a f12">加入课程</a>-->
+      <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
+  <% end %>
 </div>
 <!--<div class="pr_info_id fl mb5 f14">
       ID:<%#= @course.id%>

app/views/organizations/_org_subfield_message.html.erb

@@ -57,8 +57,10 @@
                         ) if activity.org_subfield_editable_by?(User.current) %>
                   </li>
                   <li>
-                    <%= delete_link(
+                    <%= link_to(
+                                l(:button_delete),
                                 {:controller => 'messages', :action => 'destroy', :id => activity, :board_id => activity.board_id},
+                                :method => 'post',
                                 :data => {:confirm => l(:text_are_you_sure)},
                                 :class => 'postOptionLink'
                         ) if activity.org_subfield_editable_by?(User.current) %>

app/views/organizations/setting.html.erb

@@ -58,6 +58,11 @@
           <div class="w607 fr">http：//
             <input type="text" name="organization[domain]" id="domain" value="<%= @organization.domain%>" class="orgUrlInput" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
+            <% if @organization.domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == @organization.domain %>
+                <span>(已批准)</span>
+            <% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
+                <span>(您申请了子域名<%= OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content %>，还未批准)</span>
+            <% end %>
             <p class="c_green f12" id="apply_hint" ></p></div>
           <!--class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 -->
         </div>

app/views/student_work/_work_attachments_status.html.erb

@@ -1,7 +1,7 @@
 <% attachments.each_with_index do |attachment,i| %>
     <div id="attachment_<%= attachment.id%>">
       <span class="fl">
-          <span title="<%= attachment.filename %>">
+          <span title="点击可下载">
             <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw360', :download => true -%>
           </span>
       </span>

app/views/users/_homework_detail_information.html.erb

@@ -0,0 +1,31 @@
+<div class="subjectInfo">题目信息</div>
+<div class="subjectWrap">
+  <% if homework.nil? %>
+      <span class="c_red" id="homework_notice_span">请先在左侧选择作业</span>
+  <% else %>
+      <div class="subjectIntro mb15">标题：<%=homework.name %><br />
+        来源：<%=homework.course.name %><br />
+        <% if homework.homework_type == 2 && homework.homework_detail_programing %>
+          编程语言：<%=homework.language_name %><br/>
+        <% end %>
+        贡献者：<%=homework.user.show_name %>
+        <% if homework.user.user_extensions.occupation && homework.user.user_extensions.occupation!="" %>
+            ，<%=homework.user.user_extensions.occupation%>
+        <% end %>
+        <br />
+        描述如下：
+      </div>
+      <div class="subjectContent" id="homework_description">
+        <%=homework.description.html_safe %>
+      </div>
+      <% if homework.homework_type == 2 %>
+          <div class="subjectContent mt10">
+            测试集：<%=homework.homework_tests.count %>组
+          </div>
+      <% elsif homework.homework_type ==3 && homework.homework_detail_group %>
+          <div class="subjectContent mt10">
+            分组人数：<%=homework.homework_detail_group.min_num %> - <%=homework.homework_detail_group.max_num %>人
+          </div>
+      <% end %>
+  <% end %>
+</div>

app/views/users/_homework_search_input.html.erb

@@ -0,0 +1,29 @@
+<input type="text" name="search" placeholder="输入关键词进行搜索" class="subjectSearch fr" />
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var count = 0;
+    function search_hws(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        $.ajax({
+            url: '<%= url_for(:controller => 'users', :action => 'user_search_homeworks') %>'+'?name='+ e.target.value+'&type=<%=type %>',
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询项目
+    $("input[name='search']").on('input', function (e) {
+        throttle(search_hws,window,e);
+    });
+
+</script>