From 90649209cab357b28f5e926ab61239a6fd805c52 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 30 Jan 2015 13:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=EF=BC=8C=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E7=BC=96=E6=8E=92=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=B9=B6=E5=88=A0=E6=8E=89=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=97=A0=E7=94=A8=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 556 +++----------------------
 1 file changed, 51 insertions(+), 505 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 899997456..1f78836ae 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -14,39 +14,29 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# Time 2015-01-28 16:34:21
+# Author lizanle
+# Description 封装代码,简化代码，格式化代码，
 class ProjectsController < ApplicationController
   layout :select_project_layout
 
   menu_item :overview
   menu_item :roadmap, :only => :roadmap
   menu_item :settings, :only => :settings
-  
-  menu_item l(:label_sort_by_time), :only => :index
-  menu_item l(:label_sort_by_active), :only => :index
-  menu_item l(:label_sort_by_influence), :only => :index
-  
-  # menu_item l(:label_homework), :only => :homework
-  # menu_item l(:label_course_feedback), :only => :feedback
   menu_item :homework, :only => [:homework, :new_homework]
   menu_item :feedback, :only => :feedback
-  menu_item l(:label_course_file), :only => :index
-  menu_item l(:label_course_news), :only => :index
-  
 
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
-  # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
-  #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
-  #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
-  #此条勿删 课程相关权限  ,:new_homework,:homework,:feedback,,:member
-  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join,
+                                            :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
+  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close,
+                                      :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics, :watcherlist
-  #before_filter :find_project_repository, :only => [:show]
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
   before_filter :memberAccess, only: :member
 
-  accept_rss_auth :index
+  # accept_rss_auth :index
   accept_api_auth :index, :show, :create, :update, :destroy
 
   after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
@@ -80,369 +70,66 @@ class ProjectsController < ApplicationController
   ### added by william
   include ActsAsTaggableOn::TagsHelper
 
-  def find_project_repository
-    unless @project.repositories.nil?
-      @project.repositories.each do |repository|
-        repository.fetch_changesets if Setting.autofetch_changesets?
-      end
-    end
-  end
-
-  def enterprise_course
-    session[:enterprise_college] = 2
-    respond_to do |format|
-      format.html { redirect_to :back }
-    #format.api { render_api_ok }
-    end
-  end
-  
-  def course_enterprise
-    session[:enterprise_college] = 1
-    respond_to do |format|
-      format.html { redirect_to :back }
-    #format.api { render_api_ok }
-    end
-  end
-
   def index
     render_404
-    #调用存储过程更新提交次数
-    #ActiveRecord::Base.connection.execute("CALL sp_project_status_cursor();")
-    #Modified by nie
-    @project_type = params[:project_type].to_i
-    per_page_option = 10
-
-    @projects_all = Project.active.visible.
-                      joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").joins("LEFT JOIN #{ProjectScore.table_name} ON #{Project.table_name}.id = #{ProjectScore.table_name}.project_id").
-                      where("#{Project.table_name}.project_type = ? ", Project::ProjectType_project)
-
-    @project_count = @projects_all.count
-    @project_pages = Paginator.new @project_count, per_page_option, params['page']
-
-#gcm activity count
-
-    @project_activity_count=Hash.new
-
-    @projects_all.each do |project|
-      @project_activity_count[project.id]=0
-    end
-
-    @project_activity_count=get_project_activity @projects_all,@project_activity_count
-
-#gcm end
-
-    case params[:project_sort_type]
-    when '0'
-      @projects =  @projects_all.order("created_on desc")
-      @s_type = 0
-    when '1'
-      @projects = @projects_all.order("score desc")
-      @s_type = 1
-    when '2'
-      @projects = @projects_all.order("watchers_count desc")
-      @s_type = 2
-
-      #gcm
-    when '3'
-      #@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array)
-      @projects=handle_project @projects_all,@project_activity_count
-      @s_type = 3
-      @projects =  @projects[@project_pages.offset, @project_pages.per_page]
-
-    else
-      @projects = @projects = @projects_all.order("score desc")
-      @s_type = 1
-    end
-    @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-
-    respond_to do |format|
-      format.html {        
-        # render :layout => 'base'
-        # scope = Project
-        # unless params[:closed]
-        # scope = scope.active
-        # end
-      }
-      format.api  {
-      #        @offset, @limit = api_offset_and_limit
-      #        @project_count = Project.visible.count
-      #        @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
-      }
-      format.atom {
-        projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
-        render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
-      }
-    end
   end
   
   def course
-    @project_type = params[:project_type]
-    @school_id = params[:school_id]
-    per_page_option = 10
-    if @school_id == "0" or @school_id.nil?
-      @projects_all = Project.active.visible.
-                        joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").
-                        where("#{Project.table_name}.project_type = ? ", Project::ProjectType_course)    
-    else
-      @projects_all = Project.active.visible.
-                        joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").
-                        joins(:course_extra).
-                        where("#{Project.table_name}.project_type = ?  AND #{Course.table_name}.school_id = ?", Project::ProjectType_course, @school_id)
-    end
-
-    @project_count = @projects_all.count
-    @project_pages = Paginator.new @project_count, per_page_option, params['page']
-    
-    #gcm activity count
-
-    @project_activity_count=Hash.new
-    #count initialize
-    @projects_all.each do |project|
-      @project_activity_count[project.id]=0
-    end
-
-    #@project_activity_count=get_project_activity @projects_all,@project_activity_count
-    #gcm end
-
-
-    case params[:project_sort_type]
-    when '0'
-      @projects =  @projects_all.order("created_on desc")
-      @s_type = 0
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    when '1'
-      @projects = @projects_all.order("course_ac_para desc")
-      @s_type = 1
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    when '2'
-      @projects = @projects_all.order("watchers_count desc")
-      @s_type = 2
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    #gcm
-    when '3'
-
-      #gcm
-      @project_activity_count=get_project_activity @projects_all,@project_activity_count
-      #gcmend
-
-      @projects=handle_project @projects_all,@project_activity_count
-      @s_type = 3
-      @projects =  @projects[@project_pages.offset, @project_pages.per_page]
-    else
-      @s_type = 0
-      @projects = @projects_all.order("created_on desc")
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    end
-
-    respond_to do |format|
-      format.html {
-        render :layout => 'base'
-      }
-      format.api  {
-      #        @offset, @limit = api_offset_and_limit
-      #        @project_count = Project.visible.count
-      #        @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
-      }
-      format.atom {
-        projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
-        render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
-      }
-    end
+    render_404
   end
 
-#gcm
+  # Time 2015-01-29 11:19:11
+  # Author lizanle
+  # Description 项目搜索方法
   def search
-    #modified by nie
-    project_type = params[:project_type].to_i
-    projects_all = (project_type.eql? Project::ProjectType_course) ? Project.course_entities : Project.project_entities
-    @projects = projects_all.visible
-    #@projects_all = @projects.visible.like(params[:name]) if params[:name].present?
+    # 如果有名字，就按名字搜索，如果没有，就展示所有,用Karminari分页
     if params[:name].present?
-      @projects_all = @projects.visible.like(params[:name])
+      @project_pages = Project.project_entities.visible.like(params[:name]).page(params[:page]).per(10)
     else
-      @projects_all =  @projects;
+      @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
     end
-        @project_count = @projects_all.count
-    @project_pages = Paginator.new @project_count, per_page_option, params['page']
-    
-    #gcm activity count
-
-    @project_activity_count=Hash.new
-    # count initialize
-    @projects_all.each do |project|
-      @project_activity_count[project.id]=0
-    end
-
-    #@project_activity_count=get_project_activity @projects_all,@project_activity_count
-
-    #gcm end
-
-
-    case params[:project_sort_type]
-    when '0'
-      @projects =  @projects_all.order("created_on desc")
-      @s_type = 0
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    when '1'
-      @projects = @projects_all.order("course_ac_para desc")
-      @s_type = 1
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    when '2'
-      @projects = @projects_all.order("watchers_count desc")
-      @s_type = 2
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    when '3'
-      #@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array)
-      @project_activity_count=get_project_activity @projects_all,@project_activity_count_array        #gcm
-      @projects=handle_project @projects_all,@project_activity_count
-      @s_type = 3
-      @projects =  @projects[@project_pages.offset, @project_pages.per_page]
-
-    else
-      @s_type = 0
-      @projects = @projects_all.order("created_on desc")
-      @projects =  @projects.offset(@project_pages.offset).limit(@project_pages.per_page)
-
-      #gcm
-      @project_activity_count=get_project_activity @projects,@project_activity_count
-      #gcmend
-
-    end
-    
+    @projects =   @project_pages.order("created_on desc")
     respond_to do |format|
       format.html {
         render :layout => 'base'
         scope = Project
         unless params[:closed]
-        scope = scope.active
+          scope = scope.active
         end
       }
-      format.api  {
-      #        @offset, @limit = api_offset_and_limit
-      #        @project_count = Project.visible.count
-      #        @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
-      }
+      # 需要到处atom使用的格式 （redmine自带）
       format.atom {
         projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
         render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
       }
     end 
   end
-#gcmend
-
-
-  #Added by young
-  def homework
-    @offset, @limit = api_offset_and_limit({:limit => 10})
-    @bids = @project.homeworks.order('deadline')
-    @bids = @bids.like(params[:name]) if params[:name].present?
-
-    @bids = paginateHelper @bids
-    render :layout => 'base_courses'
-   
-  end
-
-  def new_homework
-    # Dear maintainer:
-    # once you are done trying to 'optimize' this Magic routine,
-    # well, it's on you, I'll leave it to you.
-    if (User.current.logged? && 
-        (User.current.admin? || 
-          (
-            !Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && 
-            (
-              Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles &&
-              ( Role.where(id: [3, 4, 7, 9]).size > 0 )
-            )
-          )
-        )
-      )
-    @homework = Bid.new
-    @homework.safe_attributes = params[:bid]
-    render :layout => 'base_courses'
-    else
-      render_404
-    end
-      
-  end
-  #Ended by young
 
+  # Time 2015-01-29 16:13:20
+  # Author lizanle
+  # Description 项目首页中用户反馈 方法
   def feedback
-    @page = params[:page]
-    @page = @page.to_i
+    @page = params[:page].to_i
     # Find the page of the requested reply
     @jours = @project.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
-    @limit =  10
+    limit =  10
 
     offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
-    page = 1 + offset / @limit
+    page = 1 + offset / limit
     if params[:r] && @page.nil?
-      @page = page
+      @page = @page < 0 ? 1 : @page
     end
-
-    puts @page
-    if @page < 0
-      @page = 1
-    end
-    if @page > page
-      @page = page
-    end
-
-
-    #@feedback_count = @jours.count
-    #@feedback_pages = Paginator.new @feedback_count, @limit, @page
-    #@offset ||= @feedback_pages.offset
+    @page =  @page > page ? page : @page
     @jour = paginateHelper @jours,10
     @state = false
-    @base_courses_tag = @project.project_type
-
-
     respond_to do |format|
-      format.html{render :layout => 'base_courses' if @base_courses_tag==1}
+      format.html
       format.api
     end
   end
 
   def project_respond
-    # will_reply = JournalsForMessage.find(params[:reference_id]) if params[:reference_id]
     project_id = request.headers["Referer"].match((%r|/([0-9]{1,})/|))[1]
-    # @project = Project.find_by_id(project_id)
     parent_id = params[:reference_id]
     author_id = User.current.id
     reply_user_id = params[:reference_user_id]
@@ -458,12 +145,8 @@ class ProjectsController < ApplicationController
     @jfm = Project.add_new_jour(nil, nil, project_id, options)
     @save_succ = @jfm.errors.empty?
 
-    # flash[:notice]=l(:label_projects_feedback_respond_success)
-
     respond_to do |format|
-      # format.html { redirect_to :back }
       format.js
-    #format.api { render_api_ok }
     end
   end
 
@@ -554,38 +237,16 @@ class ProjectsController < ApplicationController
     render_404
     end
 
-  # Show @project
+  # Time 2015-01-29 10:42:00
+  # Author lizanle
+  # Description  项目动态展示方法，删除了不必要的代码
   def show
-    @project_type = params[:project_type]
-    
-    # try to redirect to the requested menu item
+    # 试图跳转到请求的按钮
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
-    return
+      return
     end
 
-    @users_by_role = @project.users_by_role
-    @subprojects = @project.children.visible.all
-    @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all
-    @trackers = @project.rolled_up_trackers
-    if(User.find_by_id(ProjectInfo.find_by_project_id(@project.id).try(:user_id)))
-	     @user = User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id)
-	  end
     cond = @project.project_condition(Setting.display_subprojects_issues?)
-    @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker)
-    @total_issues_by_tracker = Issue.visible.where(cond).count(:group => :tracker)
-
-    if User.current.allowed_to?(:view_time_entries, @project)
-      @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f
-    end
-
-    @key = User.current.rss_key
-    #新增内容
-    @days = Setting.activity_days_default.to_i
-
-    if params[:from]
-      begin; @date_to = params[:from].to_date + 1; rescue; end
-    end
-
     has = {
       "show_issues" => true ,
       "show_files" => true,
@@ -597,59 +258,40 @@ class ProjectsController < ApplicationController
       "show_wiki_edits"=>true,
       "show_journals_for_messages" => true
     }
+    # 读取项目默认展示的动态时间天数
+    @days = Setting.activity_days_default.to_i
     @date_to ||= Date.today + 1
-    @date_from = @date_to - @days#-1.years #modified by lizanle 去掉這個1年的時間跨度
+    # 时间跨度不能太大，不然很慢，所以删掉了-1.years
+    @date_from = @date_to - @days
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
+    @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id])
     # 决定显示所用用户或单个用户活动
-    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
-                                                             :with_subprojects => @with_subprojects,
-                                                             :author => @author)
+    @activity = Redmine::Activity::Fetcher.new(User.current,
+                                                   :project => @project,
+                                                   :with_subprojects => @with_subprojects,
+                                                   :author => @author)
     @activity.scope_select {|t| !has["show_#{t}"].nil?}
-    # logger.debug "=========================================#{@activity.scope}"
-    #   @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
 
-    # modify by nwb
-    # 添加私密性判断
-    if User.current.member_of?(@project)|| User.current.admin?
+    # 根据私密性，取出符合条件的所有数据
+    if User.current.member_of?(@project) || User.current.admin?
       events = @activity.events(@date_from, @date_to)
     else
       events = @activity.events(@date_from, @date_to, :is_public => 1)
     end
 
+
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @events_count = events.count
     @events_pages = Paginator.new @events_count, @limit, params['page']
     @offset ||= @events_pages.offset
+    # 总的数据中取出某一页
     events = events.slice(@offset,@limit)
-    #Ended by young
+    # 按天分组
     @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-    #  documents
-    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
-    documents = @project.documents.includes(:attachments, :category).all
-    case @sort_by
-    when 'date'
-      @grouped = documents.group_by {|d| d.updated_on.to_date }
-    when 'title'
-      @grouped = documents.group_by {|d| d.title.first.upcase}
-    when 'author'
-      @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
-    else
-    @grouped = documents.group_by(&:category)
-    end
-    @document = @project.documents.build
-    #
-    @base_courses_tag = @project.project_type
-    #判断能否显示真名（当前用户为课程的教师时显示真名）
-    if @project.project_type == Project::ProjectType_course
-      @teachers= searchTeacherAndAssistant(@project)
-      @canShowRealName = isCourseTeacher(User.current.id)
-    end
 
-    # real_name action为虚拟的该方法并不存在，用来辅助判断真名权限
-    # @canShowRealName = User.current.allowed_to?({:controller => "projects", :action => "real_name"}, @project || @projects, :global => false)
+    # 根据对应的请求，返回对应的数据
     respond_to do |format|
-      format.html{render :layout => 'base_courses' if @base_courses_tag==1}
+      format.html
       format.api
     end
   end
@@ -660,23 +302,13 @@ class ProjectsController < ApplicationController
     @member ||= @project.members.new
     @trackers = Tracker.sorted.all
     @wiki ||= @project.wiki
-    #Added by young
-    # @course_tag = params[:course]
-    # if @course_tag == '1'
-    #@course = Course.find_by_extra(@project.identifier)
-    # if @project.project_type == 1
-    #   render :layout => 'base_courses'
-    # else
-    #   render :layout => 'base_projects'
-    # end
-  #Ended by young
   end
 
   def edit
   end
 
-  #by young
-  include CoursesHelper
+  # by young
+  # include CoursesHelper
   def member
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'member_list'
@@ -695,11 +327,10 @@ class ProjectsController < ApplicationController
         @subPage_title = ''
         @members = @project.member_principals.includes(:roles, :principal).all.sort
       end
-    else # @project.project_type == Project::ProjectType_project
+    else
       roles = Role.find_all_givable
       @subPage_title = l :label_member_list
       @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
-      #@members = sort_project_members(@project, @members)
       @applied_members = appied_project_members(@project, @members)
     end
     @members = paginateHelper @members
@@ -956,91 +587,6 @@ class ProjectsController < ApplicationController
     end
   end
 
-
-
-  #gcm
-  def get_project_activity projects,activities
-    @project_ids=activities.keys()
-
-    days = Setting.activity_days_default.to_i
-    date_to ||= Date.today + 1
-    date_from = date_to - days-1.years
-
-    #issue_count
-    Issue.where(project_id: @project_ids).where("updated_on>?",date_from).each do |issue|
-#      activities[issue.project_id.to_s]+=1
-      activities[issue.project_id]+=issue.journals.where("created_on>?",date_from).count
-    end
-
-    #repository_count
-    Repository.where(project_id: @project_ids).each do |repository|
-#      activities[repository.project_id.to_s]+=1
-      activities[repository.project_id]+=repository.changesets.where("committed_on>?",date_from).count
-    end
-
-
-    #news_count
-    News.where(project_id: @project_ids).where("created_on>?",date_from).each do |news|
-      activities[news.project_id]+=1
-    end
-
-    #document_count
-    Document.where(project_id: @project_ids).where("created_on>?",date_from).each do |document|
-      activities[document.project_id]+=1
-    end
-
-    #file_count
-    Attachment.where(container_id: @project_ids, container_type: Project).where("created_on>?",date_from).each do |attachment|
-      activities[attachment.container_id]+=1
-    end
-
-    #message_count
-    Board.where(project_id: @project_ids).each do |board|
-#      activities[board.project_id]+=1
-      activities[board.project_id]+=board.messages.where("updated_on>?",date_from).count
-    end
-
-    #time_entry_count
-    TimeEntry.where(project_id: @project_ids).where("updated_on>?",date_from).each do |timeentry|
-      activities[timeentry.project_id]+=1
-    end
-
-    #feedbackc_count
-    JournalsForMessage.where(jour_id: @project_ids, jour_type: Project).each do |jourformess|
-      activities[jourformess.jour_id]+=1
-    end
-
-    #activities!=0
-    i=0;
-    projects.each do |project|
-      id=project.id
-      if activities[id]==0
-        activities[id]=1
-      end
-    end
-
-    return activities
-  end
-  #gcmend
-
-  #gcm
-  def handle_project projects,activities
-    project_activity_count_array=activities.values()
-
-    project_array=[]
-    i=0;
-    projects.each do |project|
-      project_array[i]=project
-      i=i+1
-    end
-
-    projects=desc_sort_course_by_avtivity(project_activity_count_array,project_array)
-
-    return projects
-  end
-  #gcmend
-
-
   #gcm
   def desc_sort_course_by_avtivity(activity_count,projects)
     return projects if activity_count.size<2