Merge branch 'szzh' into api

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb

Gemfile

@@ -18,6 +18,8 @@ gem "coderay", "~> 1.0.6"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
+gem 'spreadsheet'
+gem 'ruby-ole'
 
 group :development do
   gem 'grape-swagger'

Gemfile.lock

@@ -193,6 +193,7 @@ GEM
       rails (>= 3.2.0)
       sass-rails
     rmagick (2.13.2)
+    ruby-ole (1.2.11.7)
     ruby-openid (2.1.8)
     rubyzip (1.1.6)
     sass (3.3.10)
@@ -211,6 +212,8 @@ GEM
     shoulda-context (1.2.1)
     shoulda-matchers (2.6.1)
       activesupport (>= 3.0.0)
+    spreadsheet (1.0.0)
+      ruby-ole (>= 1.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -271,10 +274,12 @@ DEPENDENCIES
   rails (= 3.2.13)
   rich (= 1.4.6)
   rmagick (>= 2.0.0)
+  ruby-ole
   ruby-openid (~> 2.1.4)
   sass-rails (~> 3.2.3)
   seems_rateable!
   selenium-webdriver (~> 2.42.0)
   shoulda (~> 3.5.0)
+  spreadsheet
   therubyracer
   uglifier (>= 1.0.3)

app/controllers/account_controller.rb

@@ -224,7 +224,16 @@ class AccountController < ApplicationController
   def email_valid
 
   end
+  def resendmail
+    user = User.find(params[:user]) if params[:user]
+    token = Token.new(:user => user, :action => "register")
+    if token.save
+      Mailer.register(token).deliver
 
+    else
+      yield if block_given?
+    end
+  end
   private
 
   def authenticate_user

app/controllers/application_controller.rb

@@ -236,13 +236,7 @@ class ApplicationController < ActionController::Base
   # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action], global = false)
     #modify by NWB
-    if  @project
-      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
-    elsif @course
-      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global)
-    else
-      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
-    end
+    allowed  = authorize_allowed(params[:controller], params[:action],global)
 
     if allowed
       true
@@ -255,6 +249,17 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authorize_allowed(ctrl = params[:controller], action = params[:action], global = false)
+    #modify by NWB
+    if  @project
+      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+    elsif @course
+      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global)
+    else
+      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+    end
+    allowed
+  end
   def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false)
     case @attachment.container_type
       when "Memo"
@@ -754,6 +759,19 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def paginateHelper_for_members obj, pre_size=10
+    @obj_count = StudentsForCourse.find_by_sql("select count(id) as mem_count from students_for_courses where course_id = #{@course.id}")[0][:mem_count].to_s.to_i
+    @obj_pages = Paginator.new @obj_count, pre_size, params['page']
+    if obj.kind_of? ActiveRecord::Base or obj.kind_of?  ActiveRecord::Relation
+      obj.limit(@obj_pages.per_page).offset(0)
+    elsif obj.kind_of? Array
+      obj[0, @obj_pages.per_page]
+    else
+      logger.error "[ApplicationController] Error : application_controller#paginateHelper ===> unknow category: #{obj.class}"
+      raise RuntimeError, 'unknow type, Please input you type into this helper.'
+    end
+  end
+
   #查找首页相关信息
   def find_first_page
     @first_page = FirstPage.find_by_page_type('project')

app/controllers/bids_controller.rb

@@ -492,27 +492,19 @@ class BidsController < ApplicationController
       if @bid.homework_type
         @homework = HomeworkAttach.new
         @is_teacher = is_course_teacher(User.current,@bid.courses.first)
-        teachers = "("
-        teacher_members = searchTeacherAndAssistant(@bid.courses.first)
-        teacher_members.each do |member|
-          if member == teacher_members.last
-            teachers += member.user_id.to_s + ")"
-          else
-            teachers += member.user_id.to_s + ","
-          end
-        end
         if @is_teacher
-          all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score
+          all_homework_list = HomeworkAttach.find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
+              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
+              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
               FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1
               WHERE table1.t_score IS NULL")
+          @not_batch_homework = true
           @cur_type = 1
         else
-          all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score,
-              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score,
-              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
+          all_homework_list = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
+              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
+              (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
+              (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id} AND is_teacher_score = #{@is_teacher ? 1 : 0}) AS m_score
               FROM homework_attaches
               INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id
               WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY s_score DESC")
@@ -1048,8 +1040,18 @@ class BidsController < ApplicationController
    end
 
   def alert_anonymous_comment
-    hws = HomeworkService.new
-    @bid,@totle_size,@cur_size,@percent  = hws.alert_homework_anonymous_comment(params)
+    @bid = Bid.find params[:id]
+    @course = @bid.courses.first
+    if @bid.comment_status == 0
+      @totle_size = searchStudent(@course).size
+      @cur_size = @bid.homeworks.size
+    elsif @bid.comment_status == 1
+      @totle_size = 0
+      @bid.homeworks.map { |homework| @totle_size += homework.homework_evaluations.count}
+      @cur_size = 0
+      @bid.homeworks.map { |homework| @cur_size += homework.rates(:quality).where("seems_rateable_rates.is_teacher_score = 0").count}
+    end
+    @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
     respond_to do |format|
       format.js
     end

app/controllers/contests_controller.rb

@@ -134,9 +134,8 @@ class ContestsController < ApplicationController
     @state = false
 
     respond_to do |format|
-      layout_file = 'base_newcontest'
       format.html {
-        render :layout => layout_file
+        render :layout => 'base_newcontest'
       }
       format.api
     end

app/controllers/files_controller.rb

@@ -201,6 +201,7 @@ class FilesController < ApplicationController
 
   def quote_resource_show
     @file = Attachment.find(params[:id])
+    @can_quote = attachment_candown @file
   end
 
   def new
@@ -394,16 +395,18 @@ class FilesController < ApplicationController
           render :layout => 'base_courses'
         }
       end
+   else
+     show_attachments @containers
+     @attachtype = params[:type].to_i
+     @contenttype = params[:contentType].to_s
+
+     respond_to do |format|
+        format.js
+        format.html
+     end
    end
 
-    show_attachments @containers
-    @attachtype = params[:type].to_i
-    @contenttype = params[:contentType].to_s
 
-    respond_to do |format|
-       format.js
-       format.html
-    end
 
   end
 end

app/controllers/forums_controller.rb

@@ -13,6 +13,44 @@ class ForumsController < ApplicationController
   include SortHelper
 
   PageLimit = 20
+  def create_feedback
+    if User.current.logged?
+      @memo = Memo.new(params[:memo])
+      @memo.forum_id = "1"
+      @memo.author_id = User.current.id
+      #@forum = @memo.forum
+      respond_to do |format|
+        if @memo.save
+          format.html { redirect_to forum_path(@memo.forum) }
+        else
+          sort_init 'updated_at', 'desc'
+          sort_update 'created_at' => "#{Memo.table_name}.created_at",
+                      'replies' => "#{Memo.table_name}.replies_count",
+                      'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+
+          @topic_count = @forum.topics.count
+          @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+          @memos = @forum.topics.
+              reorder("#{Memo.table_name}.sticky DESC").
+              includes(:last_reply).
+              limit(@topic_pages.per_page).
+              offset(@topic_pages.offset).
+              order(sort_clause).
+              preload(:author, {:last_reply => :author}).
+              all
+
+          flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+          # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+          format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+          format.json { render json: @memo.errors, status: :unprocessable_entity }
+        end
+      end
+    else
+      respond_to do |format|
+       format.html { redirect_to signin_path }
+     end
+    end
+  end
 
   def create_memo
     @memo = Memo.new(params[:memo])
@@ -49,16 +87,15 @@ class ForumsController < ApplicationController
       end
     end
   end
-  
+
   def index
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @forums_all = Forum.reorder("sticky DESC")
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
-
     @offset ||= @forums_pages.offset
-     @forums = @forums_all.offset(@offset).limit(@limit).all
+    @forums = @forums_all.offset(@offset).limit(@limit).all
     #@forums = Forum.all
     respond_to do |format|
       format.html # index.html.erb
@@ -86,14 +123,12 @@ class ForumsController < ApplicationController
                     preload(:author, {:last_reply => :author}).
                     all
 
-
-
     # @offset, @limit = api_offset_and_limit({:limit => 10})
     # @forum = Forum.find(params[:id])
     # @memos_all = @forum.topics
     # @topic_count = @memos_all.count
     # @topic_pages = Paginator.new @topic_count, @limit, params['page']
-    
+
     # @offset ||= @topic_pages.offset
     # @memos = @memos_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -176,7 +211,6 @@ class ForumsController < ApplicationController
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
-
     @offset ||= @forums_pages.offset
     @forums = @forums_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -197,7 +231,7 @@ class ForumsController < ApplicationController
     @memos_all = @forum.topics.where("subject LIKE ?", q)
     @topic_count = @memos_all.count
     @topic_pages = Paginator.new @topic_count, @limit, params['page']
-    
+
     @offset ||= @topic_pages.offset
     @memos = @memos_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -205,20 +239,17 @@ class ForumsController < ApplicationController
         render 'show', :layout => 'base_forums'
       }
       format.json { render json: @forum }
-    end 
+    end
   end
 
-
-
   private
 
-
   def find_forum_if_available
     @forum = Forum.find(params[:id]) if params[:id]
   rescue ActiveRecord::RecordNotFound
     render_404
     nil
-  end
+    end
 
   def authenticate_user_edit
     find_forum_if_available

app/controllers/members_controller.rb

@@ -129,7 +129,7 @@ class MembersController < ApplicationController
               member =  Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
               role = Role.find_by_id(params[:membership][:role_ids])
               # 这里的判断只能通过角色名，可以弄成常量
-              if role.name == "学生"
+              if role.name == "学生" || role.name == "Student"
                 StudentsForCourse.create(:student_id => user_id, :course_id =>@course.id)
               end
               members << member
@@ -210,7 +210,7 @@ class MembersController < ApplicationController
         if (params[:membership][:role_ids])
           role = Role.find(params[:membership][:role_ids][0])
           # 这里的判断只能通过角色名，可以弄成常量
-          if role.name == "学生"
+          if role.name == "学生"  || role.name == "Student"
             StudentsForCourse.create(:student_id => @member.user_id, :course_id =>@course.id)
           else
             joined = StudentsForCourse.where('student_id = ? and course_id = ?', @member.user_id,@course.id)

app/controllers/my_controller.rb

@@ -150,6 +150,7 @@ class MyController < ApplicationController
         File.delete(diskfile1)
       end
     end
+
   end
 
   # Destroys user's account

app/controllers/poll_answer_controller.rb

@@ -0,0 +1,2 @@
+class PollAnswerController < ApplicationController
+end

app/controllers/poll_controller.rb

@@ -0,0 +1,2 @@
+class PollController < ApplicationController
+end

app/controllers/poll_question_controller.rb

@@ -0,0 +1,2 @@
+class PollQuestionController < ApplicationController
+end

app/controllers/poll_user_controller.rb

@@ -0,0 +1,2 @@
+class PollUserController < ApplicationController
+end

app/controllers/poll_vote_controller.rb

@@ -0,0 +1,2 @@
+class PollVoteController < ApplicationController
+end

app/controllers/softapplications_controller.rb

@@ -48,7 +48,7 @@ class SoftapplicationsController < ApplicationController
 
   def show
     @softapplication = Softapplication.find(params[:id])
-    @project = @softapplication.project
+    #@project = @softapplication.project
     # 打分统计
     stars_reates = @softapplication.
                     rates(:quality)

app/controllers/users_controller.rb

@@ -41,7 +41,7 @@ class UsersController < ApplicationController
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                   :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index]
   before_filter :auth_user_extension, only: :show
-  before_filter :rest_user_score, only: :show
+  #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
   accept_api_auth :index, :show, :create, :update, :destroy,:tag_save  , :tag_saveEx
   
@@ -129,7 +129,7 @@ class UsersController < ApplicationController
   end
 
   def show_new_score
-    render :layout => false
+    render :layout => 'users_base'
   end
 # end
 
@@ -188,9 +188,9 @@ class UsersController < ApplicationController
     for user in @watcher
       events << Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 30)
     end
-    
-    
-    
+
+
+
     @events_by_day = events.group_by(&:event_date)
 
     unless User.current.admin?
@@ -393,7 +393,6 @@ class UsersController < ApplicationController
       end
       @users = scope.offset(@offset).limit(limit).all.reverse
     end
-        
     respond_to do |format|
       format.html {
         @groups = Group.all.sort
@@ -435,9 +434,16 @@ class UsersController < ApplicationController
       else
         activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') 
       end
+
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
-      @activity = activity.offset(@activity_pages.offset).limit(@activity_pages.per_page).all
+      activity_page = activity.slice(@activity_pages.offset,@activity_pages.per_page * 2)
+      activity_page = activity_page.reject { |e|
+        ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
+            ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
+            ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
+      }
+      @activity = activity.slice(0,@activity_pages.per_page)
       @state = 0
     end
     

app/controllers/welcome_controller.rb

@@ -62,13 +62,49 @@ class WelcomeController < ApplicationController
     @course_page = FirstPage.find_by_page_type('course')
     @school_id = params[:school_id] || User.current.user_extensions.school.try(:id)
     @logoLink ||= logolink()
+
+    ##3-8月份为查找春季课程，9-2月份为查找秋季课程
+    #month_now = Time.now.strftime("%m").to_i
+    #year_now = Time.new.strftime("%Y").to_i
+    #(month_now >= 3 && month_now < 9) ? course_term = l(:label_spring) : course_term = l(:label_autumn)
+    ##year_now -= 1 if year_now < 3
+    #@school_id.nil? ? @cur_school_course = [] : @cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term)
+    ##未登录或者当前学校未开设课程
+    #if @cur_school_course.empty?
+    #  @has_course = false
+    #  User.current.logged? ? course_count = 9 : course_count = 10
+    #  @cur_school_course += find_all_new_hot_course(course_count, @school_id, year_now, course_term)
+    #  while @cur_school_course.count < 9 do
+    #    if course_term == l(:label_spring)
+    #      course_term = l(:label_autumn)
+    #      year_now -= 1
+    #    else
+    #      course_term = l(:label_spring)
+    #    end
+    #    @cur_school_course += find_all_new_hot_course((10-@cur_school_course.count), nil, year_now, course_term)
+    #  end
+    #else
+    #  if @cur_school_course.count < 9
+    #    @has_course = false
+    #    @cur_school_course += find_all_new_hot_course(9-@cur_school_course.count, @school_id, year_now, course_term)
+    #    if @cur_school_course.count < 9
+    #      if course_term == l(:label_spring)
+    #        course_term = l(:label_autumn)
+    #        year_now -= 1
+    #      else
+    #        course_term = l(:label_spring)
+    #      end
+    #      @cur_school_course += find_all_new_hot_course(9-@cur_school_course.count, nil, year_now, course_term)
+    #    end
+    #  else
+    #    @has_course = true
+    #  end
+    #end
   end
-  
-  
-  
- def logolink()
-   @course_page = FirstPage.find_by_page_type('course')
-   logo = get_avatar?(@course_page)
+
+  def logolink()
+    @course_page = FirstPage.find_by_page_type('course')
+    logo = get_avatar?(@course_page)
     id = params[:school_id]
     logo_link = ""
     if id.nil? && (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?)
@@ -110,6 +146,7 @@ class WelcomeController < ApplicationController
   def search
     search_condition = params[:q] 
     search_type = params[:search_type].to_sym unless search_condition.blank?
+    search_by = params[:search_by]
 
     if search_type.nil? && params[:contests_search] && params[:name] != ""
       search_type  = :contests
@@ -127,11 +164,11 @@ class WelcomeController < ApplicationController
         when :contests
           redirect_to contests_url(:name => search_condition)
         when :users
-          redirect_to users_search_url(:name => search_condition)
+          redirect_to users_search_url(:name => search_condition,:search_by => search_by)
         when :users_teacher
-          redirect_to users_search_url(:name => search_condition, :role => :teacher)
+          redirect_to users_search_url(:name => search_condition, :search_by => search_by, :role => :teacher)
         when :users_student
-          redirect_to users_search_url(:name => search_condition, :role => :student)
+          redirect_to users_search_url(:name => search_condition, :search_by => search_by, :role => :student)
         else
           #redirect_to home_path, :alert => l(:label_sumbit_empty)
         (redirect_to home_url, :notice => l(:label_sumbit_empty);return) #if params[:name].blank?

app/controllers/zipdown_controller.rb

@@ -75,16 +75,21 @@ class ZipdownController < ApplicationController
 
   def zip_homework_by_user(homeattach)
     homeworks_attach_path = []
+    not_exist_file = []
     # 需要将所有homework.attachments遍历加入zip
     # 并且返回zip路径
     homeattach.attachments.each do |attach|
-      homeworks_attach_path << attach.diskfile#.to_s.slice((length+1)..-1)
+      if File.exist?(attach.diskfile)
+        homeworks_attach_path << attach.diskfile
+      else
+        not_exist_file << attach.filename
+      end
     end
-    zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true)
+    zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
   end
 
 
-  def zipping(zip_name_refer, files_paths, output_path, is_attachment=false)
+  def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])
     # 输入待打包的文件列表，已经打包文件定位到ouput_path
     ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE')
     input_filename = files_paths
@@ -101,9 +106,11 @@ class ZipdownController < ApplicationController
 
         zipfile.add(rename_file, filename)
       end
-      #zipfile.get_output_stream('ReadMe') do |os|
-      #  os.write 'Homeworks'
-      #end
+      unless not_exist_file.empty?
+        zipfile.get_output_stream('FILE_LOST.txt') do |os|
+          os.write l(:label_file_lost) + not_exist_file.join(',').to_s
+        end
+      end
     end
     zipfile_name
   rescue Errno => e
@@ -119,4 +126,4 @@ class ZipdownController < ApplicationController
     attach = Attachment.find_by_disk_filename(name)
     attach.filename
   end
-end
+end

app/helpers/application_helper.rb

@@ -1593,6 +1593,12 @@ module ApplicationHelper
     end
     s
   end
+  
+  def get_memo
+    @new_memo = Memo.new
+    #@new_memo.subject = "有什么想说的，尽管来咆哮吧~~"
+    @public_forum = Forum.find(1)
+  end
 
   private
 

app/helpers/courses_helper.rb

@@ -20,7 +20,7 @@ module CoursesHelper
 
   # 返回教师数量，即roles表中定义的Manager
   def teacherCount project
-    searchTeacherAndAssistant(project).count
+    project.members.count - studentCount(project).to_i
     # or
     # searchTeacherAndAssistant(project).count
   end
@@ -114,7 +114,7 @@ module CoursesHelper
   # 学生人数计算
   # add by nwb
   def studentCount course
-    searchStudent(course).count.to_s#course.student.count
+    course.student.count.to_s#course.student.count
   end
 
   #课程成员数计算
@@ -164,13 +164,20 @@ module CoursesHelper
     members
   end
   def searchStudent project
-      #searchPeopleByRoles(project, StudentRoles)
-      members = []
-      project.members.each do |m|
-        members << m  if m && m.user && m.user.allowed_to?(:as_student,project)
+    #searchPeopleByRoles(project, StudentRoles)
+    members = []
+
+    project.members.each do |m|
+      if m && m.user && m.user.allowed_to?(:as_student,project)
+        members << m
+
       end
+    end
     members
   end
+
+  
+ 
   def searchStudent_by_name  project, name
     #searchPeopleByRoles(project, StudentRoles)
     members = []
@@ -184,6 +191,39 @@ module CoursesHelper
     end
     members
   end
+  def searchmember_by_name  members, name
+    #searchPeopleByRoles(project, StudentRoles)
+    mems = []
+    if name != ""
+     members.each do |m|
+
+        username = m.user[:lastname].to_s + m.user[:firstname].to_s
+        if(m.user[:login].to_s.include?(name) ||  m.user.user_extensions[:student_id].to_s.include?(name) || username.include?(name))
+          mems << m
+        end
+      end
+    else
+     mems = members
+   end
+    mems
+  end
+  def searchgroupmember_by_name  members, name, group
+    #searchPeopleByRoles(project, StudentRoles)
+    mems = []
+    if name != ""
+    members.each do |m|
+    if m.course_group_id == group.id
+      username = m.user[:lastname].to_s + m.user[:firstname].to_s
+      if(m.user[:login].to_s.include?(name) ||  m.user.user_extensions[:student_id].to_s.include?(name) || username.include?(name))
+        mems << m
+      end
+    end
+    end
+    else
+      mems = members
+    end
+    mems
+  end
   def searchgroupstudent_by_name(group, project, name)
     members = []
     group.members.each do |m|
@@ -392,7 +432,13 @@ module CoursesHelper
       return teacher_score_for_homework homework
     end
   end
-
+  def score_for_homework_new homework
+    if  teacher_score_for_homework(homework) != 0
+      return teacher_score_for_homework homework
+    else
+      return student_score_for_homework homework
+    end
+  end
   #获取作业的互评得分
   def student_score_for_homework homework
     #member = searchTeacherAndAssistant(homework.bid.courses.first).first#searchPeopleByRoles(homework.bid.courses.first,TeacherRoles).first

app/helpers/issues_helper.rb

@@ -227,7 +227,7 @@ module IssuesHelper
     strings = []
     values_by_field = {}
     details.each do |detail|
-      unless detail.property == 'attachment'
+
       if detail.property == 'cf'
         field_id = detail.prop_key
         field = CustomField.find_by_id(field_id)
@@ -243,7 +243,7 @@ module IssuesHelper
         end
       end
       strings << show_detail(detail, no_html, options)
-      end
+
     end
     values_by_field.each do |field_id, changes|
       detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)

app/helpers/watchers_helper.rb

@@ -98,7 +98,7 @@ module WatchersHelper
     # modify by nwb
     # 主讲教师不允许退出课程
     return '' if user.id == course.tea_id
-    joined = user.member_of_course?(course)
+    joined = course.members.map{|m| m.user}.include? user
     text = joined ? l(:label_exit_course) : l(:label_new_join)
     url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id)
     method = joined ? 'delete' : 'post'